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/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.example.admin.sleepbetter"
-        minSdkVersion 21
+        minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
         android:allowBackup="true"
         android:icon="@drawable/pill"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/pill"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".FirstPage">