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

.idea/misc.xml

@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/res/layout/what_is_chatbot.xml

@@ -133,7 +133,7 @@
                 <ImageView
                     android:id="@+id/imageView5"
                     android:layout_width="100dp"
-                    android:layout_height="10dp"
+                    android:layout_height="100dp"
                     android:layout_marginEnd="260dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="16dp"