diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 74960d1..cb0ef0b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.example.cosmosclient">
 
+    android:hardwareAccelerated="true"
+    <!--ここからバーコードリーダーのアクセス許可-->
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <!--<uses-permission android:name="android.permission.FLASHLIGHT"/>-->
+    <!--バーコードリーダーアクセス許可終わり-->
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -10,10 +16,14 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".views.ForgotPasswordActivity"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
-        <activity
-            android:name=".views.SigninActivity"
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:replace="screenOrientation" />
+        <activity android:name=".views.QRcodeReadingActivity"
+            android:screenOrientation="portrait"
+            tools:replace="screenOrientation">
+        </activity>
+        <activity android:name=".views.SigninActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -21,9 +31,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".views.SignupActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
-            android:name=".views.SignupActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:name=".views.ForgotPasswordActivity"
+            android:theme="@style/AppTheme.NoActionBar"></activity>
         <activity android:name=".MainActivity"></activity>
         <activity
             android:name=".views.RequestListActivity"
diff --git a/app/src/main/java/com/example/cosmosclient/retrofitsample/Ele.java b/app/src/main/java/com/example/cosmosclient/retrofitsample/Ele.java
new file mode 100644
index 0000000..22eb70a
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/retrofitsample/Ele.java
@@ -0,0 +1,6 @@
+package com.example.cosmosclient.retrofitsample;
+
+public class Ele {
+    public String elevation;
+    public String hsrc;
+}
diff --git a/app/src/main/java/com/example/cosmosclient/retrofitsample/GisActivity.java b/app/src/main/java/com/example/cosmosclient/retrofitsample/GisActivity.java
new file mode 100644
index 0000000..e85e386
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/retrofitsample/GisActivity.java
@@ -0,0 +1,60 @@
+package com.example.cosmosclient.retrofitsample;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+
+import com.example.cosmosclient.R;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+
+public class GisActivity  extends AppCompatActivity{
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_gis);
+
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("http://cyberjapandata2.gsi.go.jp/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+        GisService service = retrofit.create(GisService.class);
+//        ObjectMapper mapper = new ObjectMapper();
+//        try {
+//            ArrayList<Ele> list = mapper.readValue((InputStream) service.listEles(140.08531, 36.103543, "JSON"), new TypeReference<ArrayList<Ele>>() {});
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+
+        Call<Ele> call = service.listEles(140.08531, 36.103543, "JSON");
+        call.enqueue(new Callback<Ele>() {
+            @Override
+            public void onResponse(Call<Ele> call, Response<Ele> response) {
+                if (response.isSuccessful()) {
+                    Ele result = response.body();
+                    System.out.println(result.elevation);
+                    System.out.println(result.hsrc);
+                }
+            }
+
+            @Override
+            public void onFailure(Call<Ele> call, Throwable t) {
+                t.printStackTrace();
+            }
+
+        });
+    }
+
+}
diff --git a/app/src/main/java/com/example/cosmosclient/retrofitsample/GisService.java b/app/src/main/java/com/example/cosmosclient/retrofitsample/GisService.java
new file mode 100644
index 0000000..f036f50
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/retrofitsample/GisService.java
@@ -0,0 +1,15 @@
+package com.example.cosmosclient.retrofitsample;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import java.util.ArrayList;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface GisService {
+    @GET("general/dem/scripts/getelevation.php")
+    Call<Ele> listEles(@Query("lon") double lon, @Query("lat") double lat, @Query("outtype") String outtype);
+
+}
diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupList.java b/app/src/main/java/com/example/cosmosclient/views/GroupList.java
index b512f02..f9067e5 100644
--- a/app/src/main/java/com/example/cosmosclient/views/GroupList.java
+++ b/app/src/main/java/com/example/cosmosclient/views/GroupList.java
@@ -28,7 +28,7 @@
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        /*とりあえずの画面遷移なので変更するかも*/
+        /* とりあえずの画面遷移なので変更するかも */
         TextView group1 = findViewById(R.id.group1);
         group1.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -38,6 +38,7 @@
             }
         });
 
+
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
@@ -82,10 +83,18 @@
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
+
+
         // Handle navigation view item clicks here.
         int id = item.getItemId();
         if ( id == R.id.createNewGroupButton){
 
+        } else if (id == R.id.joinGroupButton){
+            Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.QRcodeReadingActivity.class);
+            startActivity(intent);
+        } else if (id == R.id.signOutButton){
+            Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.SigninActivity.class);
+            startActivity(intent);
         }
 /*
         if (id == R.id.nav_home) {
diff --git a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java
new file mode 100644
index 0000000..af17d80
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java
@@ -0,0 +1,45 @@
+package com.example.cosmosclient.views;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import com.example.cosmosclient.R;
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
+import com.journeyapps.barcodescanner.CaptureActivity;
+
+public class QRcodeReadingActivity extends CaptureActivity {
+    public String QRcodeData = null;
+    TextView QRcodeResult;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_qrcode_reading);
+        QRcodeResult = findViewById(R.id.QRcodeResult);
+
+        //ここでQRコードリーダーオブジェクト生成
+        IntentIntegrator integrator = new IntentIntegrator(this);
+//        new IntentIntegrator(QRcodeReadingActivity.this).initiateScan();
+        // スキャン画面の回転の制御
+        integrator.setOrientationLocked(false);
+        //バーコードリーダーの起動
+        integrator.initiateScan();
+
+    }
+
+    //QRコードから読み取った結果の取得
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+        if(result != null) {
+            QRcodeData = (String)result.getContents();
+            QRcodeResult.setText(QRcodeData);
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/cosmosclient/views/Signin.java b/app/src/main/java/com/example/cosmosclient/views/Signin.java
new file mode 100644
index 0000000..b67541e
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/Signin.java
@@ -0,0 +1,10 @@
+package com.example.cosmosclient.views;
+
+import retrofit2.Call;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+
+public interface Signin {
+    @POST("/users/{uId}/login")
+    Call<login> loginlist(@Path("uId") String uId,@Path("pw")String pw);
+}
diff --git a/app/src/main/java/com/example/cosmosclient/views/Signup.java b/app/src/main/java/com/example/cosmosclient/views/Signup.java
index 6adb7d4..9e83c16 100644
--- a/app/src/main/java/com/example/cosmosclient/views/Signup.java
+++ b/app/src/main/java/com/example/cosmosclient/views/Signup.java
@@ -1,7 +1,5 @@
 package com.example.cosmosclient.views;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 import retrofit2.Call;
 import retrofit2.http.POST;
 import retrofit2.http.Path;
diff --git a/app/src/main/java/com/example/cosmosclient/views/login.java b/app/src/main/java/com/example/cosmosclient/views/login.java
new file mode 100644
index 0000000..6533ecf
--- /dev/null
+++ b/app/src/main/java/com/example/cosmosclient/views/login.java
@@ -0,0 +1,5 @@
+package com.example.cosmosclient.views;
+
+public class login {
+    public String token;
+}
diff --git a/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
new file mode 100644
index 0000000..beafea3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_group_add_black_24dp.xml b/app/src/main/res/drawable/ic_group_add_black_24dp.xml
new file mode 100644
index 0000000..b3a2fb3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_add_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8,10L5,10L5,7L3,7v3L0,10v2h3v3h2v-3h3v-2zM18,11c1.66,0 2.99,-1.34 2.99,-3S19.66,5 18,5c-0.32,0 -0.63,0.05 -0.91,0.14 0.57,0.81 0.9,1.79 0.9,2.86s-0.34,2.04 -0.9,2.86c0.28,0.09 0.59,0.14 0.91,0.14zM13,11c1.66,0 2.99,-1.34 2.99,-3S14.66,5 13,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM19.62,13.16c0.83,0.73 1.38,1.66 1.38,2.84v2h3v-2c0,-1.54 -2.37,-2.49 -4.38,-2.84zM13,13c-2,0 -6,1 -6,3v2h12v-2c0,-2 -4,-3 -6,-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_group_black_24dp.xml b/app/src/main/res/drawable/ic_group_black_24dp.xml
new file mode 100644
index 0000000..4cfd869
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_gis.xml b/app/src/main/res/layout/activity_gis.xml
new file mode 100644
index 0000000..d8fb324
--- /dev/null
+++ b/app/src/main/res/layout/activity_gis.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_qrcode_reading.xml b/app/src/main/res/layout/activity_qrcode_reading.xml
new file mode 100644
index 0000000..3a7780e
--- /dev/null
+++ b/app/src/main/res/layout/activity_qrcode_reading.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".views.QRcodeReadingActivity">
+
+    <TextView
+        android:id="@+id/QRcodeResult"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="aaaaaaaaaaaaaaaa"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_group_list.xml b/app/src/main/res/layout/content_group_list.xml
index 0cd1e28..f5435db 100644
--- a/app/src/main/res/layout/content_group_list.xml
+++ b/app/src/main/res/layout/content_group_list.xml
@@ -10,17 +10,23 @@
 
     <GridView
         android:id="@+id/GroupList"
-        android:layout_width="419dp"
-        android:layout_height="234dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_width="0dp"
+        android:layout_height="400dp"
+        android:layout_marginStart="32dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
+        android:layout_marginBottom="4dp"
+        android:background="#FBFCC3"
         android:numColumns="2"
+        android:verticalSpacing="20dp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/group1"
+        app:layout_constraintVertical_bias="1.0" />
 
     <TextView
         android:id="@+id/group1"
diff --git a/app/src/main/res/menu/activity_group_list_drawer.xml b/app/src/main/res/menu/activity_group_list_drawer.xml
index 45f9007..2b49b0f 100644
--- a/app/src/main/res/menu/activity_group_list_drawer.xml
+++ b/app/src/main/res/menu/activity_group_list_drawer.xml
@@ -41,7 +41,15 @@
     </item>
     <item
         android:id="@+id/createNewGroupButton"
-        android:icon="@drawable/ic_add_circle_black_24dp"
+        android:icon="@drawable/ic_group_add_black_24dp"
         android:title="新規グループ作成" />
+    <item
+        android:id="@+id/joinGroupButton"
+        android:icon="@drawable/ic_group_black_24dp"
+        android:title="グループに入る" />
+    <item
+        android:id="@+id/signOutButton"
+        android:icon="@drawable/ic_arrow_back_black_24dp"
+        android:title="サインアウト" />
 
 </menu>
diff --git a/build.gradle b/build.gradle
index fafc1b9..02199bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 18955ab..ff18aab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 26 15:58:11 JST 2019
+#Tue May 28 15:35:44 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip