Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/res/layout/activity_first_page_consent.xml

app/src/main/java/com/example/admin/sleepbetter/FirstPage.java

@@ -147,12 +147,14 @@ public class FirstPage extends AppCompatActivity {
 
         if (!isFirstRun && consent.isChecked() && bitmoji.isChecked() && !nameBox.getText().toString().equals("") && !participantID.getText().toString().equals("")) {
             //show start activity
+
+            getSharedPreferences("PREFERENCE", MODE_PRIVATE).edit()
+                    .putBoolean("isFirstRun", false).apply();
+
             startActivity(new Intent(this, MainMenu.class));
 
         }
 
-        getSharedPreferences("PREFERENCE", MODE_PRIVATE).edit()
-                .putBoolean("isFirstRun", false).apply();
 
 
     }