Merge branch 'master' of gitlab.com:smileomi18/arrest-tb

 Conflicts:

	app/build.gradle

	app/src/main/AndroidManifest.xml

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

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

	app/src/main/res/menu/menu.xml

app/src/test/java/com/ShanMukhaInnovations/ArrestTB/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.ShanMukhaInnovations.ArrestTB;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}