diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 35787bf2..87e9182c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,7 +71,6 @@
         <activity android:name="com.peacecorps.malaria.EffectivenessFragmentActivity"/>
         <activity android:name="com.peacecorps.malaria.ThirdAnalyticFragment"/>
         <activity android:name="com.peacecorps.malaria.DayFragmentActivity"/>
-<<<<<<< HEAD
         <activity android:name="com.peacecorps.malaria.TripIndicatorFragmentActivity"
                   android:launchMode="singleTask"
                   />
@@ -92,9 +91,6 @@
 
 
 
-=======
-        <activity android:name="com.peacecorps.malaria.TripIndicatorFragmentActivity"/>
->>>>>>> ankita-gsoc-gradlebuild
     </application>
 
 </manifest>
diff --git a/res/drawable/progress_bg.xml b/res/drawable/progress_bg.xml
index d94549b6..51b9b246 100644
--- a/res/drawable/progress_bg.xml
+++ b/res/drawable/progress_bg.xml
@@ -5,11 +5,7 @@
         <shape>
             <corners android:radius="5dip" />
 
-<<<<<<< HEAD
             <solid android:color="#fff9e2ce" />
-=======
-            <solid android:color="#fff9b9a8" />
->>>>>>> ankita-gsoc-gradlebuild
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/res/layout/day_dialog.xml b/res/layout/day_dialog.xml
index fa628008..1f8394be 100644
--- a/res/layout/day_dialog.xml
+++ b/res/layout/day_dialog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-<<<<<<< HEAD
     android:layout_height="wrap_content"
     android:background="@drawable/dialog_background"
     android:id="@+id/dialogMedGroup">
@@ -36,27 +35,12 @@
             </TextView>
 
         </LinearLayout>
-=======
-    android:layout_height="200dp"
-    android:background="@drawable/background"
-    android:id="@+id/dialogMedGroup">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
->>>>>>> ankita-gsoc-gradlebuild
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-<<<<<<< HEAD
             <ImageView
                 android:id="@+id/image"
                 android:layout_width="60dp"
@@ -73,24 +57,6 @@
                 android:text="Change Entry!"
                 android:layout_toRightOf="@+id/image"
                 android:layout_margin="10dp" />
-=======
-        <ImageView
-        android:id="@+id/image"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginRight="5dp"
-        android:background="@drawable/drug_normal"
-            android:layout_margin="10dp" />
-
-        <TextView
-        android:id="@+id/text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/golden_brown"
-        android:text="Change Entry!"
-        android:layout_toRightOf="@+id/image"
-            android:layout_margin="10dp" />
->>>>>>> ankita-gsoc-gradlebuild
 
         </LinearLayout>
 
@@ -100,7 +66,6 @@
             android:layout_height="fill_parent"
             android:orientation="vertical" >
 
-<<<<<<< HEAD
             <RadioGroup
                 android:id="@+id/radioGroup"
                 android:layout_width="wrap_content"
@@ -165,65 +130,5 @@
         </LinearLayout>
 
     </LinearLayout>
-=======
-        <RadioGroup
-            android:id="@+id/radioGroup"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-
-            <RadioButton
-                android:id="@+id/radioYes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Yes"
-                android:checked="true" />
-
-            <RadioButton
-                android:id="@+id/radioNo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="No" />
-
-        </RadioGroup>
-        </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0.29"
-        android:gravity="center|bottom"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
-    <Button
-        android:id="@+id/dialogButtonOK"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="OK"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="5dp"
-        android:background="@color/light_red"
-        android:textColor="@color/white"
-        />
-
-        <Button
-            android:id="@+id/dialogButtonCancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Cancel"
-            android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginLeft="10dp"
-            android:background="@color/light_red"
-            android:textColor="@color/white"
-
-            />
-   </LinearLayout>
->>>>>>> ankita-gsoc-gradlebuild
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/effectiveness_fragment.xml b/res/layout/effectiveness_fragment.xml
index cfe612a0..0910098f 100644
--- a/res/layout/effectiveness_fragment.xml
+++ b/res/layout/effectiveness_fragment.xml
@@ -19,11 +19,7 @@
         android:textSize="25sp"
         android:gravity="center"
         android:textStyle="bold"
-<<<<<<< HEAD
         android:id="@+id/eam"
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
 
         />
     <View android:layout_width="match_parent"
@@ -44,12 +40,8 @@
                 android:text="@string/dump_test"
                 android:textColor="@color/black"
                 android:layout_height="wrap_content"
-<<<<<<< HEAD
                 android:id="@+id/effectivenessLabel"
                 android:textSize="20sp"/>
-=======
-                android:id="@+id/effectivenessLabel"/>
->>>>>>> ankita-gsoc-gradlebuild
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_second_analytic_screen.xml b/res/layout/fragment_second_analytic_screen.xml
index 9f1f642d..30238611 100644
--- a/res/layout/fragment_second_analytic_screen.xml
+++ b/res/layout/fragment_second_analytic_screen.xml
@@ -31,10 +31,7 @@
             android:id="@+id/firstMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
-<<<<<<< HEAD
             android:textSize="18sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
 
             />
@@ -77,10 +74,7 @@
             android:id="@+id/secondMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
-<<<<<<< HEAD
             android:textSize="18sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
             />
 
@@ -105,10 +99,7 @@
             android:id="@+id/secondMonthProgressPercent"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
-<<<<<<< HEAD
             android:textSize="18sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
             />
 
     </LinearLayout>
@@ -126,10 +117,7 @@
             android:id="@+id/thirdMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
-<<<<<<< HEAD
             android:textSize="18sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
             />
 
@@ -153,10 +141,7 @@
             android:id="@+id/thirdMonthProgressPercent"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
-<<<<<<< HEAD
             android:textSize="18sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
             />
 
     </LinearLayout>
@@ -173,29 +158,18 @@
             android:id="@+id/fourthMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
-<<<<<<< HEAD
             android:textSize="18sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
             />
 
         <ProgressBar android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:progress="80"
-<<<<<<< HEAD
             android:progressDrawable="@drawable/saf_progress_bar"
             android:layout_weight="1"
             style="?android:attr/progressBarStyleHorizontal"
             android:id="@+id/fourthMonthProgressBar"
             android:background="@drawable/progress_bg"
-=======
-            android:progressDrawable="@drawable/saf_progress_bar_green"
-            android:layout_weight="1"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:id="@+id/fourthMonthProgressBar"
-            android:background="@drawable/progress_bg_green"
->>>>>>> ankita-gsoc-gradlebuild
             android:layout_marginRight="5dp"
             android:layout_marginLeft="5dp"
             android:onClick="sendMonth"
@@ -209,10 +183,7 @@
             android:id="@+id/fourthMonthProgressPercent"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
-<<<<<<< HEAD
             android:textSize="18sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
             />
 
     </LinearLayout>
@@ -222,10 +193,7 @@
     <LinearLayout android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-<<<<<<< HEAD
         android:background="@drawable/graph_bg"
-=======
->>>>>>> ankita-gsoc-gradlebuild
         android:id="@+id/graphView"
         >
 
diff --git a/res/layout/info_hub_screen.xml b/res/layout/info_hub_screen.xml
index c0683bb6..61981e52 100644
--- a/res/layout/info_hub_screen.xml
+++ b/res/layout/info_hub_screen.xml
@@ -49,10 +49,7 @@
                     <TextView android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/info_hub_title_label"
-<<<<<<< HEAD
                         android:id="@+id/ih"
-=======
->>>>>>> ankita-gsoc-gradlebuild
                         android:textColor="@color/golden_brown"
                         android:textSize="25sp"
                         android:textStyle="bold"
diff --git a/res/layout/peace_corps_policy_fragment.xml b/res/layout/peace_corps_policy_fragment.xml
index ddbc05e7..8241834f 100644
--- a/res/layout/peace_corps_policy_fragment.xml
+++ b/res/layout/peace_corps_policy_fragment.xml
@@ -19,11 +19,7 @@
               android:textSize="25sp"
               android:gravity="center"
               android:textStyle="bold"
-<<<<<<< HEAD
               android:id="@+id/pcp"
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
 
             />
     <View android:layout_width="match_parent"
@@ -43,10 +39,7 @@
               android:padding="5dp"
               android:text="@string/dump_test"
               android:textColor="@color/black"
-<<<<<<< HEAD
               android:textSize="20sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
               android:layout_height="wrap_content"
               android:id="@+id/peaceCorpsPolicyLabel"
             />
diff --git a/res/layout/resetdata_dialog.xml b/res/layout/resetdata_dialog.xml
index ab7c551d..4f02721e 100644
--- a/res/layout/resetdata_dialog.xml
+++ b/res/layout/resetdata_dialog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-<<<<<<< HEAD
     android:layout_height="wrap_content"
     android:background="@drawable/dialog_background"
     android:id="@+id/dialogReset">
@@ -44,26 +43,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:layout_weight="0.96">
-=======
-    android:layout_height="200dp"
-    android:background="@drawable/background"
-    android:id="@+id/dialogReset">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/scrollView">
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
->>>>>>> ankita-gsoc-gradlebuild
 
                 <ImageView
                     android:id="@+id/imageReset"
@@ -86,13 +65,8 @@
 
 
             <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<<<<<<< HEAD
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-=======
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
->>>>>>> ankita-gsoc-gradlebuild
                 android:orientation="vertical" >
 
                 <RadioGroup
@@ -105,19 +79,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Yes"
-<<<<<<< HEAD
                         android:checked="true"
                         android:tint="@color/light_red"
                         android:textColor="@color/black"/>
-=======
-                        android:checked="true" />
->>>>>>> ankita-gsoc-gradlebuild
 
                     <RadioButton
                         android:id="@+id/radioNoReset"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-<<<<<<< HEAD
                         android:text="No"
                         android:tint="@color/light_red"
                         android:textColor="@color/black"/>
@@ -169,60 +138,5 @@
             </LinearLayout>
         </LinearLayout>
 
-=======
-                        android:text="No" />
-
-                </RadioGroup>
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-
-    <GridLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:weightSum="1"
-        android:layout_below="@+id/scrollView"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginLeft="78dp"
-        android:layout_marginStart="78dp"
-        android:id="@+id/gridLayout">
-
-
-
-    <Button
-        android:id="@+id/dialogButtonOKReset"
-        android:layout_width="100dp"
-        android:layout_height="wrap_content"
-        android:text="OK"
-        android:background="@color/light_red"
-        android:textColor="@color/white"
-        android:layout_weight="1"
-        android:layout_gravity="center_horizontal"
-        android:layout_columnSpan="8"
-        android:layout_alignTop="@+id/dialogButtonCancel"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-    <Button
-        android:id="@+id/dialogButtonCancelReset"
-        android:layout_width="100dp"
-        android:layout_height="wrap_content"
-        android:text="Cancel"
-        android:background="@color/light_red"
-        android:textColor="@color/white"
-        android:layout_weight="1"
-        android:layout_gravity="center_horizontal"
-        android:layout_row="0"
-        android:layout_column="11"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
-
-    </GridLayout>
->>>>>>> ankita-gsoc-gradlebuild
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/side_effects_npcv_fragment.xml b/res/layout/side_effects_npcv_fragment.xml
index 74c34262..db8d798b 100644
--- a/res/layout/side_effects_npcv_fragment.xml
+++ b/res/layout/side_effects_npcv_fragment.xml
@@ -19,11 +19,7 @@
         android:textSize="25sp"
         android:gravity="center"
         android:textStyle="bold"
-<<<<<<< HEAD
         android:id="@+id/sen"
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
 
         />
     <View android:layout_width="match_parent"
@@ -45,10 +41,7 @@
                 android:textColor="@color/black"
                 android:layout_height="wrap_content"
                 android:id="@+id/sideEffectsNPCVLabel"
-<<<<<<< HEAD
                 android:textSize="20sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
                 />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/side_effects_pcv_fragment.xml b/res/layout/side_effects_pcv_fragment.xml
index 2da0fafc..2f6512c4 100644
--- a/res/layout/side_effects_pcv_fragment.xml
+++ b/res/layout/side_effects_pcv_fragment.xml
@@ -19,11 +19,7 @@
         android:textSize="25sp"
         android:gravity="center"
         android:textStyle="bold"
-<<<<<<< HEAD
         android:id="@+id/sep"
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
 
         />
     <View android:layout_width="match_parent"
@@ -45,10 +41,7 @@
                 android:textColor="@color/black"
                 android:layout_height="wrap_content"
                 android:id="@+id/sideEffectsPCVLabel"
-<<<<<<< HEAD
                 android:textSize="20sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
                 />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/side_effects_percentage_fragment.xml b/res/layout/side_effects_percentage_fragment.xml
index 4efcaf3c..61171efb 100644
--- a/res/layout/side_effects_percentage_fragment.xml
+++ b/res/layout/side_effects_percentage_fragment.xml
@@ -17,12 +17,7 @@
         android:textSize="25sp"
         android:gravity="center"
         android:textStyle="bold"
-<<<<<<< HEAD
         android:id="@+id/pse"
-=======
-
-
->>>>>>> ankita-gsoc-gradlebuild
         />
     <View android:layout_width="match_parent"
         android:layout_height="0.2dp"
@@ -43,10 +38,7 @@
                 android:textColor="@color/black"
                 android:layout_height="wrap_content"
                 android:id="@+id/percentSideEffectsLabel"
-<<<<<<< HEAD
                 android:textSize="20sp"
-=======
->>>>>>> ankita-gsoc-gradlebuild
                 />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/trip_item_dropdown_list.xml b/res/layout/trip_item_dropdown_list.xml
index f660e776..2dc1cd6e 100644
--- a/res/layout/trip_item_dropdown_list.xml
+++ b/res/layout/trip_item_dropdown_list.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 android:layout_width="fill_parent"
 android:layout_height="wrap_content"
@@ -61,20 +60,3 @@ android:id="@+id/dialogReset">
 
 
 </RelativeLayout>
-=======
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tripPackingItemPopUpView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <ListView android:id="@+id/tripPackingItemDropDownList"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/light_green"
-        >
-    </ListView>
-
-</LinearLayout>
-
->>>>>>> ankita-gsoc-gradlebuild
diff --git a/res/layout/tripindicator_layout.xml b/res/layout/tripindicator_layout.xml
index 67ef5dc0..6540bd6a 100644
--- a/res/layout/tripindicator_layout.xml
+++ b/res/layout/tripindicator_layout.xml
@@ -51,10 +51,7 @@
                         android:textColor="@color/golden_brown"
                         android:textSize="30sp"
                         android:textStyle="bold"
-<<<<<<< HEAD
                         android:id="@+id/pmt"
-=======
->>>>>>> ankita-gsoc-gradlebuild
                         android:layout_marginTop="10dp"
                         android:layout_marginLeft="10dp"
 
@@ -82,7 +79,6 @@
                         />
 
 
-<<<<<<< HEAD
                     <EditText
                         android:id="@+id/trip_location_select_editText"
                         android:layout_width="0dp"
@@ -95,26 +91,11 @@
                         android:hint="Enter Location"
                         android:paddingBottom="5dp"
                         android:paddingTop="5dp"
-=======
-                    <Spinner
-                       android:id="@+id/trip_location_select_spinner"
-                       android:layout_width="0dp"
-                       android:layout_height="40dp"
-                        android:layout_marginTop="20dp"
-                        android:paddingLeft="10dp"
-                        android:background="@drawable/trip_spinner_arr"
-                        android:layout_marginLeft="10dp"
-                        android:textSize="10dp"
-                        android:paddingBottom="5dp"
->>>>>>> ankita-gsoc-gradlebuild
                         android:textColor="@color/cream"
                         android:layout_weight="1"
 
 
-<<<<<<< HEAD
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
                         />
 
                      <ImageView
@@ -123,18 +104,14 @@
                          android:background="@drawable/location_trip"
                          android:layout_marginTop="20dp"
                          android:layout_marginRight="10dp"
-<<<<<<< HEAD
                          android:id="@+id/locationHistory"
                          android:clickable="true"
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
                          />
 
 
              </LinearLayout>
 
-<<<<<<< HEAD
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -321,154 +298,15 @@
                     />
 
             </LinearLayout>
-=======
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/pack_label"
-                        android:textColor="@color/golden_brown"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="30dp"
-                        />
-
-                    <LinearLayout
-                        xmlns:android="http://schemas.android.com/apk/res/android"
-                        android:layout_width="0dp"
-                        android:layout_height="40dp"
-                        android:background="@drawable/trip_spinner_dte"
-                        android:id="@+id/tripItemSelector"
-                        android:layout_marginRight="20dp"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginLeft="10dp"
-                        android:layout_weight="1"
-                        >
-                    <TextView
-                        android:id  ="@+id/tripSelectBox"
-                        android:layout_width="120dp"
-                        android:layout_height="30dp"
-                        android:hint="Add Packing Items"
-                        android:textColorHint="@color/cream"
-                        android:textColor="@color/cream"
-                        android:textSize="12dp"
-                        android:padding="5dp"
-                        android:layout_marginLeft="5dp"
-
-                        />
-
-
-                    <Button android:id="@+id/tripCreate"
-                        android:layout_width="14dp"
-                        android:layout_height="14dp"
-                        android:background="@drawable/arrow_down"
-                        android:layout_gravity="bottom|right"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentBottom="true"
-                        android:layout_marginRight="0dp"
-                        android:layout_marginBottom="5dp"
-                        />
-
-
-
-
-                </LinearLayout>
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/medication_label"
-                        android:textColor="@color/golden_brown"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="30dp"/>
-
-
-                    <Spinner
-                        android:id="@+id/trip_medication_select_spinner"
-                        android:layout_width="wrap_content"
-                        android:layout_height="40dp"
-                        android:background="@drawable/trip_spinner_arr"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginRight="30dp"
-                        android:paddingLeft="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:textSize="10dp"
-                        android:paddingBottom="5dp"
-                        android:textColor="@color/cream"
-                        android:entries="@array/user_medicine_settings_activity_drug_array"
-                        android:prompt="@string/medication_spinner_label"
-                        android:popupBackground="@color/light_green"
-                        />
-
-
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/cash_label"
-                        android:textColor="@color/golden_brown"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="30dp"/>
-
-
-                    <EditText
-                        android:id="@+id/trip_cash_select_editext"
-                        android:layout_width="wrap_content"
-                        android:layout_height="40dp"
-                        android:background="@drawable/trip_spinner_dte"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginRight="30dp"
-                        android:paddingLeft="10dp"
-                        android:layout_marginLeft="10dp"
-                        android:textSize="15dp"
-                        android:paddingBottom="5dp"
-                        android:textColor="@color/cream"
-                        android:tag="Cash"
-                        android:hint="Cash in $"
-                        />
-
-
-
-                </LinearLayout>
->>>>>>> ankita-gsoc-gradlebuild
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-<<<<<<< HEAD
                     android:orientation="horizontal">
-=======
-                    android:orientation="horizontal"
-                    android:weightSum="1"
-                    >
->>>>>>> ankita-gsoc-gradlebuild
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-<<<<<<< HEAD
                         android:text="@string/pack_label"
                         android:textColor="@color/golden_brown"
                         android:id="@+id/tripItemSelector"
@@ -544,99 +382,11 @@
                     android:layout_marginRight="10dp"
                     android:layout_marginTop="20dp"
                     android:layout_weight="1"
-=======
-                        android:text="@string/remind_label"
-                        android:textColor="@color/golden_brown"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="30dp"/>
-
-                    <EditText
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:hint="DD"
-                        android:layout_marginTop="20dp"
-                        android:paddingLeft="6dp"
-                        android:layout_marginLeft="10dp"
-                        android:textSize="15dp"
-                        android:paddingBottom="5dp"
-                        android:textColor="@color/white"
-                        android:background="@drawable/trip_spinner_dte"
-                        android:id="@+id/trip_date"
-                        android:layout_marginRight="2dp"
-                        />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="/"
-                        android:textColor="@color/golden_brown"
-                        android:layout_marginTop="20dp"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                         />
-
-                    <EditText
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:hint="MM"
-                        android:layout_marginTop="20dp"
-                        android:paddingLeft="6dp"
-                        android:layout_marginLeft="2dp"
-                        android:textSize="15dp"
-                        android:paddingBottom="5dp"
-                        android:layout_marginRight="2dp"
-                        android:textColor="@color/white"
-                        android:background="@drawable/trip_spinner_dte"
-                        android:id="@+id/trip_month"
-                        />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="/"
-                        android:textColor="@color/golden_brown"
-                        android:layout_marginTop="20dp"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        />
-
-
-                    <EditText
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:hint="YY"
-                        android:layout_marginTop="20dp"
-                        android:paddingLeft="6dp"
-                        android:layout_marginLeft="2dp"
-                        android:textSize="15dp"
-                        android:paddingBottom="5dp"
-                        android:textColor="@color/white"
-                        android:background="@drawable/trip_spinner_dte"
-                        android:id="@+id/trip_year"
-                        />
-
-                </LinearLayout>
-
-
-                <Button
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/info_hub_button"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="15dp"
-                    android:text="@string/trip_button_label"
-                    android:textColor="@color/white"
-                    android:id="@+id/generateButton"
->>>>>>> ankita-gsoc-gradlebuild
                     />
 
 
 
 
-<<<<<<< HEAD
             </LinearLayout>
 
 
@@ -724,82 +474,6 @@
         android:id="@+id/generateButton"
         android:layout_below="@+id/scrollSegmentTrip"
         android:layout_centerHorizontal="true" />
-=======
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_alignBottom="@id/scrollSegment"
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <View
-                android:layout_height="0.5dp"
-                android:layout_width="200dp"
-                android:background="#000000"
-                android:layout_gravity="center_horizontal"
-
-                />
-
-            <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="10dp"
-                android:paddingBottom="5dp"
-
-                >
-
-                <Button
-                    android:id="@+id/homeButton"
-
-                    android:background="@drawable/home_icon_inactive_normal"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:adjustViewBounds="true"
-                    android:layout_marginRight="15dp"
-                    android:scaleType="fitCenter"
-
-                    />
-
-                <Button
-                    android:background="@drawable/bus_icon_normal"
-                    android:layout_width="40dp"
-                    android:layout_height="30dp"
-                    android:adjustViewBounds="true"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:scaleType="fitCenter"
-                    android:id="@+id/tripButton"
-
-                    />
-
-
-                <Button
-                    android:background="@drawable/info_hub_inactive_normal"
-                    android:id="@+id/infoButton"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:adjustViewBounds="true"
-                    android:layout_marginLeft="15dp"
-                    android:scaleType="fitCenter"
-                    />
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-        </LinearLayout>
-
-
-
-
-        </ScrollView>
-
-
->>>>>>> ankita-gsoc-gradlebuild
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/volunteer_adherence_fragment.xml b/res/layout/volunteer_adherence_fragment.xml
index 0f1010b9..5af2ee5f 100644
--- a/res/layout/volunteer_adherence_fragment.xml
+++ b/res/layout/volunteer_adherence_fragment.xml
@@ -19,11 +19,7 @@
         android:textSize="25sp"
         android:gravity="center"
         android:textStyle="bold"
-<<<<<<< HEAD
         android:id="@+id/var"
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
         />
     <View android:layout_width="match_parent"
         android:layout_height="0.2dp"
@@ -43,12 +39,8 @@
                 android:text="@string/dump_test"
                 android:textColor="@color/black"
                 android:layout_height="wrap_content"
-<<<<<<< HEAD
                 android:id="@+id/volunteerAdherenceLabel"
                 android:textSize="20sp"/>
-=======
-                android:id="@+id/volunteerAdherenceLabel"/>
->>>>>>> ankita-gsoc-gradlebuild
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/color.xml b/res/values/color.xml
index 77235657..b312d2f4 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -18,10 +18,7 @@
     <color name="gray">#808080</color>
     <color name="lightgray">#e7e7e7</color>
     <color name="lightgray02">#bfbfbf</color>
-<<<<<<< HEAD
     <color name="light_blue">#7700eeec</color>
-=======
->>>>>>> ankita-gsoc-gradlebuild
     <color name="dark">#000015</color>
     <color name="green">#ff136612</color>
     <color name="red">#e33d1b</color>
@@ -30,10 +27,7 @@
     <color name="lightest_red">#EF9A9A</color>
     <color name="cream">#fffff7bf</color>
     <color name="light_green">#ff8fc24e</color>
-<<<<<<< HEAD
     <color name="lightest_brown">#ffe0cf79</color>
     <color name="transparent_cream">#89fffefa</color>
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f41c9771..e5ffa00d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -22,7 +22,6 @@
     <style name="AppTheme" parent="@android:style/Theme.Holo.Light">
 
         <item name="android:actionBarStyle">@style/MyActionBar</item>
-<<<<<<< HEAD
         <item name="android:datePickerStyle">@style/MyDatePicker</item>
         <item name="android:textColorPrimary">@color/golden_brown</item>
 
@@ -39,8 +38,6 @@
         <item name="android:borderlessButtonStyle">@style/Widget.AppTheme.Button.Borderless</item>
         <item name="android:buttonBarStyle">@style/AppTheme.ButtonBar.AlertDialog</item>
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
     </style>
 
     <style name="MyActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
@@ -48,7 +45,6 @@
         <item name="android:titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>
     </style>
 
-<<<<<<< HEAD
     <style name="MyTimePicker" parent="android:style/Theme.Holo.Light.Dialog">
         <item name="android:divider">@color/golden_brown</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -106,8 +102,6 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
     <style name="AppTheme.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.StatusBar.Title">
         <item name="android:textColor">@color/cream</item>
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
diff --git a/src/com/peacecorps/malaria/AlarmHandlerClass.java b/src/com/peacecorps/malaria/AlarmHandlerClass.java
index ee1f0393..95630fc3 100755
--- a/src/com/peacecorps/malaria/AlarmHandlerClass.java
+++ b/src/com/peacecorps/malaria/AlarmHandlerClass.java
@@ -12,6 +12,8 @@
 
 public class AlarmHandlerClass extends BroadcastReceiver {
 
+    /**Class is for Handling the Alarm**/
+
     public static Calendar mAlarmScheduleTime;
     final int INTERVAL_WEEK = 604800000;
     public static AlarmManager mAlarmManager;
@@ -20,13 +22,15 @@ public class AlarmHandlerClass extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+
+        /**On Receiving the call for Alarm, it sets one on the date and time specified. **/
         PowerManager powerManager = (PowerManager) context
                 .getSystemService(Context.POWER_SERVICE);
         PowerManager.WakeLock wakeLock = powerManager.newWakeLock(
                 PowerManager.PARTIAL_WAKE_LOCK, "");
         wakeLock.acquire();
 
-        /** Opening the Alert Dialog Window */
+        /** Opening the Alert Dialog Window On Clicking Notification*/
 
         intent = new Intent(context, AlertCallerFragmentActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -35,6 +39,7 @@ public void onReceive(Context context, Intent intent) {
     }
 
     public void getSharedPreferences(Context context) {
+        /**Initializing the Shared Preferences for Storing Details**/
         mSharedPreferenceStore.mPrefsStore = context.getSharedPreferences(
                 "com.peacecorps.malaria.storeTimePicked", Context.MODE_PRIVATE);
         mSharedPreferenceStore.mEditor = mSharedPreferenceStore.mPrefsStore
@@ -44,12 +49,14 @@ public void getSharedPreferences(Context context) {
     public void setAlarm(Context context) {
 
         getSharedPreferences(context);
+        /**Getting the Time**/
         int hour = mSharedPreferenceStore.mPrefsStore.getInt(
                 "com.peacecorps.malaria.AlarmHour", -1);
         int minute = mSharedPreferenceStore.mPrefsStore.getInt(
                 "com.peacecorps.malaria.AlarmMinute", -1);
         if ((hour != -1) && (minute != -1)) {
             AlarmTime(context, hour, minute);
+            /**Setting Alarm**/
             mAlarmManager = (AlarmManager) context
                     .getSystemService(Context.ALARM_SERVICE);
             Intent alarmIntent = new Intent(
@@ -58,10 +65,12 @@ public void setAlarm(Context context) {
                     alarmIntent, Intent.FLAG_ACTIVITY_NEW_TASK);
             if (mSharedPreferenceStore.mPrefsStore.getBoolean(
                     "com.peacecorps.malaria.isWeekly", false)) {
+                /**Weekly Alarm**/
                 mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
                         mAlarmScheduleTime.getTimeInMillis(), INTERVAL_WEEK,
                         pendingAlarm);
             } else {
+                /**Daily Alarm**/
                 mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
                         mAlarmScheduleTime.getTimeInMillis(),
                         AlarmManager.INTERVAL_DAY, pendingAlarm);
@@ -71,7 +80,7 @@ public void setAlarm(Context context) {
     }
 
     public void AlarmTime(Context context, int hour, int minute) {
-
+        /**Setting The Alarm Time **/
         Date date = new Date();
         mAlarmScheduleTime = Calendar.getInstance();
         mAlarmScheduleTime.setTime(date);
diff --git a/src/com/peacecorps/malaria/AlarmService.java b/src/com/peacecorps/malaria/AlarmService.java
index 40cfb380..4440f786 100755
--- a/src/com/peacecorps/malaria/AlarmService.java
+++ b/src/com/peacecorps/malaria/AlarmService.java
@@ -6,6 +6,8 @@
 
 public class AlarmService extends Service {
 
+    /**Setting up Alarm Calls his Alarm Service**/
+
     AlarmHandlerClass alarmHandlerClass = new AlarmHandlerClass();
 
     @Override
@@ -28,7 +30,7 @@ public void onCreate() {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-
+        /**Alarm Service Request Made and Alarm Handler will Handle It. **/
         alarmHandlerClass.setAlarm(AlarmService.this);
         return START_STICKY;
     }
diff --git a/src/com/peacecorps/malaria/AlertCallerFragmentActivity.java b/src/com/peacecorps/malaria/AlertCallerFragmentActivity.java
index 5d641cd9..8e850988 100755
--- a/src/com/peacecorps/malaria/AlertCallerFragmentActivity.java
+++ b/src/com/peacecorps/malaria/AlertCallerFragmentActivity.java
@@ -11,7 +11,7 @@
 
 public class AlertCallerFragmentActivity extends FragmentActivity {
     static SharedPreferenceStore mSharedPreferenceStore;
-
+    /**Calls the Alert Dialog as fragment of Home Screen**/
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,7 +26,7 @@ public void run() {
                 getSharedPreferences();
                 if (mSharedPreferenceStore.mPrefsStore.getBoolean(
                         "com.peacecorps.malaria.isWeekly", false)) {
-
+                    /**Weekly Day has reached, now Alarm will remind for Pill**/
                     if (checkDrugTakenTimeInterval(weeklyDate) == 0
                             || checkDrugTakenTimeInterval(weeklyDate) >= 7) {
                         callAlarm();
@@ -42,20 +42,20 @@ public void run() {
     }
 
     public void callAlarm() {
-<<<<<<< HEAD
 
-        AlertDialogFragment alert = new AlertDialogFragment();
-=======
->>>>>>> ankita-gsoc-gradlebuild
+        /**Shows the Alert Dialog with Taken, Snooze and Not Taken Button**/
 
         AlertDialogFragment alert = new AlertDialogFragment();
+
         alert.show(getSupportFragmentManager(), "alertDemo");
+
         alert.setCancelable(false);
 
     }
 
     public long checkDrugTakenTimeInterval(String time) {
 
+        /**Finding the interval between Date when last drug was taken and Today.**/
         long interval = 0;
         long today = new Date().getTime();
         long takenDate = mSharedPreferenceStore.mPrefsStore.getLong("com.peacecorps.malaria."
@@ -67,8 +67,7 @@ public long checkDrugTakenTimeInterval(String time) {
     }
 
     public void getSharedPreferences() {
-        // reading the application SharedPreferences for storing of time and
-        // drug selected
+        /**reading the application SharedPreferences for storing of time and drug selected**/
         mSharedPreferenceStore.mPrefsStore = getSharedPreferences(
                 "com.peacecorps.malaria.storeTimePicked", Context.MODE_PRIVATE);
         mSharedPreferenceStore.mEditor = mSharedPreferenceStore.mPrefsStore
diff --git a/src/com/peacecorps/malaria/AlertDialogFragment.java b/src/com/peacecorps/malaria/AlertDialogFragment.java
index 780a378e..7631a669 100755
--- a/src/com/peacecorps/malaria/AlertDialogFragment.java
+++ b/src/com/peacecorps/malaria/AlertDialogFragment.java
@@ -1,5 +1,7 @@
 package com.peacecorps.malaria;
-
+/*
+Edited By Ankita
+ */
 import java.util.Calendar;
 import java.util.Date;
 
@@ -12,23 +14,16 @@
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
-<<<<<<< HEAD
 import android.graphics.Color;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
-<<<<<<< HEAD
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.WindowManager.LayoutParams;
 import android.widget.Button;
-=======
-import android.view.WindowManager.LayoutParams;
->>>>>>> ankita-gsoc-gradlebuild
 import android.widget.Toast;
 
 
@@ -78,12 +73,14 @@ public void run() {
                         if (flag == 0) {
                             if (mSharedPreferenceStore.mPrefsStore.getBoolean(
                                     "com.peacecorps.malaria.isWeekly", false)) {
+                                /**Updates the date when weekly drug was taken and set the alarm for nex weekly Date**/
                                 saveUsersettings(true, true);
                                 DatabaseSQLiteHelper databaseSQLiteHelper = new DatabaseSQLiteHelper(getActivity());
                                 databaseSQLiteHelper.getUserMedicationSelection(getActivity(), "weekly", Calendar.getInstance().getTime(), "yes", computeAdherenceRate());
                                 changeWeeklyAlarmTime();
                                 alarmNotificationManager.cancelAll();
                             } else {
+                                /**Updating the Daily Alarm and Cancelling today's notification because Drug is already Taken**/
                                 if (checkDrugTakenTimeInterval("dateDrugTaken") > 0) {
                                     saveUsersettings(true, false);
                                     DatabaseSQLiteHelper databaseSQLiteHelper = new DatabaseSQLiteHelper(getActivity());
@@ -96,10 +93,7 @@ public void run() {
                         else {
                             if (flag == 1) {
                                 Toast.makeText(getActivity(), "You have already taken medicine", Toast.LENGTH_SHORT).show();
-<<<<<<< HEAD
                                 alarmNotificationManager.cancelAll();
-=======
->>>>>>> ankita-gsoc-gradlebuild
                             } else {
                                 Toast.makeText(getActivity(), "You have not taken medicine. Modify later, if you have taken.", Toast.LENGTH_SHORT).show();
                                 snooze();
@@ -123,6 +117,7 @@ public void run() {
                             if (mSharedPreferenceStore.mPrefsStore.getBoolean(
                                     "com.peacecorps.malaria.isWeekly", false)) {
                                 saveUsersettings(true, false);
+                                /**Marked as Not Taken. No reminders now,it ll be for next time now.**/
                                 DatabaseSQLiteHelper databaseSQLiteHelper = new DatabaseSQLiteHelper(getActivity());
                                 databaseSQLiteHelper.getUserMedicationSelection(getActivity(), "weekly", Calendar.getInstance().getTime(), "no", computeAdherenceRate());
                                 changeWeeklyAlarmTime();
@@ -138,10 +133,7 @@ public void run() {
                         } else {
                             if (flag == 1) {
                                 Toast.makeText(getActivity(), "You have taken the medicine. Modify it later, if you have not taken it.", Toast.LENGTH_SHORT).show();
-<<<<<<< HEAD
                                 alarmNotificationManager.cancelAll();
-=======
->>>>>>> ankita-gsoc-gradlebuild
                             } else {
                                 Toast.makeText(getActivity(), "You have not taken the medicine.", Toast.LENGTH_SHORT).show();
                                 snooze();
@@ -161,10 +153,7 @@ public void onClick(DialogInterface dialog, int which) {
                     snooze();
                 } else {
                     Toast.makeText(getActivity(),"You have already taken medicine, no need to snooze.",Toast.LENGTH_SHORT).show();
-<<<<<<< HEAD
                     alarmNotificationManager.cancelAll();
-=======
->>>>>>> ankita-gsoc-gradlebuild
                 }
             }
         }).setCancelable(false);
@@ -175,6 +164,8 @@ public void onClick(DialogInterface dialog, int which) {
 
     public long checkDrugTakenTimeInterval(String time) {
         long interval = 0;
+
+        /**Calculating the Interval**/
         long today = new Date().getTime();
         Date tdy= Calendar.getInstance().getTime();
         tdy.setTime(today);
@@ -194,8 +185,7 @@ public long checkDrugTakenTimeInterval(String time) {
                     interval=sqLite.getIntervalDaily(start,tdy);
                 SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria."
                         + time, takenDate).apply();
-                /*long oneDay = 1000 * 60 * 60 * 24;
-                interval = (today - takenDate) / oneDay;*/
+
                 return interval;
             }
             else
@@ -211,6 +201,7 @@ public long checkDrugTakenTimeInterval(String time) {
     }
 
     public void snooze() {
+        /**Snoozing The Alarm**/
         getActivity().runOnUiThread(new Runnable() {
 
             @Override
@@ -234,6 +225,7 @@ public void run() {
     }
 
     public void changeWeeklyAlarmTime() {
+        /**Function to set the alarm for next week**/
         int hour = Calendar.getInstance().get(Calendar.HOUR);
         int minute = Calendar.getInstance().get(Calendar.MINUTE) - 1;
         getActivity().startService(
@@ -246,6 +238,7 @@ public void changeWeeklyAlarmTime() {
 
     public void saveUsersettings(Boolean state, Boolean isWeekly) {
         if (isWeekly) {
+            /**Storing the Dates**/
             mSharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria.weeklyDate",
                     new Date().getTime()).commit();
             mSharedPreferenceStore.mEditor.putBoolean(
@@ -264,6 +257,8 @@ public void saveUsersettings(Boolean state, Boolean isWeekly) {
     }
 
     public void getSettings() {
+
+        /**Setting the reminder according to setting**/
         mDrugAcceptedCount = mSharedPreferenceStore.mPrefsStore.getInt(
                 "com.peacecorps.malaria.drugAcceptedCount", 0);
         mDrugRejectedCount = mSharedPreferenceStore.mPrefsStore.getInt(
@@ -308,6 +303,8 @@ public void onDestroy() {
     public void showNotification(String msg)
     {
         Log.d("AlarmService", "Preparing to send notification...: " + msg);
+
+        /**Setting Up Alarm**/
         alarmNotificationManager = (NotificationManager) getActivity()
                 .getSystemService(Context.NOTIFICATION_SERVICE);
 
@@ -315,7 +312,7 @@ public void showNotification(String msg)
                 new Intent(getActivity(), AlertCallerFragmentActivity.class), 0);
 
         Uri sound = Uri.parse("android.resource://" + getActivity().getPackageName() + "/" + R.raw.soundsmedication);
-
+        /**Building Notifications**/
         NotificationCompat.Builder alamNotificationBuilder = new NotificationCompat.Builder(
                 getActivity()).setContentTitle("Malaria Prevention").setSmallIcon(R.drawable.appicon_themed)
                 .setStyle(new NotificationCompat.BigTextStyle().bigText(msg))
@@ -329,13 +326,10 @@ public void showNotification(String msg)
     }
 
     public double computeAdherenceRate() {
+        /**calculating Adherence Rate**/
         long interval = checkDrugTakenTimeInterval("firstRunTime");
-<<<<<<< HEAD
         DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(getActivity());
         long takenCount = sqLite.getCountTaken();
-=======
-        int takenCount = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0);
->>>>>>> ankita-gsoc-gradlebuild
         double adherenceRate = ((double)takenCount / (double)interval) * 100;
         Log.d(TAGADF, "adherence:" + adherenceRate);
         return adherenceRate;
diff --git a/src/com/peacecorps/malaria/AuthJSONObjectRequest.java b/src/com/peacecorps/malaria/AuthJSONObjectRequest.java
index 2f429eb2..8a27d5ce 100644
--- a/src/com/peacecorps/malaria/AuthJSONObjectRequest.java
+++ b/src/com/peacecorps/malaria/AuthJSONObjectRequest.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 
 public class AuthJSONObjectRequest extends JsonObjectRequest {
-
+    /**Custom JSON Object Request For Webpage Which Requires Authentication**/
     public AuthJSONObjectRequest(int method, String url, JSONObject jsonRequest, Response.Listener<JSONObject> listener,Response.ErrorListener errorListener) {
 
         super(method, url, jsonRequest, listener, errorListener);
@@ -24,6 +24,7 @@ public AuthJSONObjectRequest(int method, String url, JSONObject jsonRequest, Res
     @Override
     public Map<String, String> getHeaders() throws AuthFailureError {
         HashMap<String, String> params = new HashMap<String, String>();
+        /**Setting Up Password and Username for Posts at MACC**/
         String creds = String.format("%s:%s","TestUser","password");
         String auth = "Basic " + Base64.encodeToString(creds.getBytes(), Base64.NO_WRAP);
         Log.d("AUTHJSONObjectRequest",auth);
diff --git a/src/com/peacecorps/malaria/DatabaseSQLiteHelper.java b/src/com/peacecorps/malaria/DatabaseSQLiteHelper.java
index 193de799..cdc99eef 100644
--- a/src/com/peacecorps/malaria/DatabaseSQLiteHelper.java
+++ b/src/com/peacecorps/malaria/DatabaseSQLiteHelper.java
@@ -16,13 +16,13 @@
 
 /**
  * Created by Chimdi on 7/18/14.
- */
+ * Edited by Ankita
+ **/
 public class DatabaseSQLiteHelper extends SQLiteOpenHelper {
 
     private static final String DATABASE_NAME = "MalariaDatabase";
     private static final String userMedicationChoiceTable = "userSettings";
     private static final String appSettingTable = "appSettings";
-<<<<<<< HEAD
     private static final String locationTable = "locationSettings";
     private static final String packingTable = "packingSettings";
     private static final String TAGDSH= "DatabaseSQLiteHelper";
@@ -31,9 +31,6 @@ public class DatabaseSQLiteHelper extends SQLiteOpenHelper {
     public static final String KEY_ROW_ID = "_id";
     public static final String QUANTITY = "Quantity";
 
-=======
-    private static final String TAGDSH= "DatabaseSQLiteHelper";
->>>>>>> ankita-gsoc-gradlebuild
     private final int[] daysOfMonth = { 31, 28, 31, 30, 31, 30, 31, 31, 30,
             31, 30, 31 };
     private final int[] daysOfMonthLeap = { 31, 29, 31, 30, 31, 30, 31, 31, 30,
@@ -45,13 +42,11 @@ public DatabaseSQLiteHelper(Context context) {
 
     @Override
     public void onCreate(SQLiteDatabase database) {
+        /**Creating Tables**/
         database.execSQL("CREATE TABLE " + userMedicationChoiceTable + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, Drug INTEGER,Choice VARCHAR, Month VARCHAR, Year VARCHAR,Status VARCHAR,Date INTEGER,Percentage DOUBLE, Timestamp VARCHAR);");
         database.execSQL("CREATE TABLE " + appSettingTable + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, Drug VARCHAR, Choice VARCHAR, WeeklyDay INTEGER, FirstTime LONG, FreshInstall VARCHAR);");
-<<<<<<< HEAD
         database.execSQL("CREATE TABLE " + locationTable + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, Location VARCHAR, Times INTEGER);");
         database.execSQL("CREATE TABLE " + packingTable + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, PackingItem VARCHAR, Quantity INTEGER, Status VARCHAR);");
-=======
->>>>>>> ankita-gsoc-gradlebuild
     }
 
     @Override
@@ -63,8 +58,9 @@ public void onUpgrade(SQLiteDatabase database, int oldVersion, int newVersion) {
     public static ArrayList<Double> percentage;
     public static ArrayList<Integer> date;
 
+    /**Method to Update the Progress Bars**/
     public int getData(int month, int year, String choice) {
-        //Log.d(TAGDSH, "INSIDE GET DATA DATE");
+
         percentage = new ArrayList<Double>();
         date = new ArrayList<Integer>();
         int count = 0;
@@ -94,6 +90,9 @@ public int getData(int month, int year, String choice) {
         return count;
     }
 
+    /**Method to Update the User Selection of Medicine and it's Status of whether Medicine was taken or not.
+     * Used in Alert Dialog to Directly update the current Status
+     * Used in Home Screen Fragment for updating the current status through tick marks**/
     public void getUserMedicationSelection(Context context, String choice, Date date, String status, Double percentage) {
         ContentValues values = new ContentValues(2);
         Calendar cal;
@@ -124,8 +123,8 @@ public void getUserMedicationSelection(Context context, String choice, Date date
         this.getWritableDatabase().close();
 
     }
-<<<<<<< HEAD
 
+    /*Method to Be used in Future for storing appSettings directly in the Database, decreasing complexity**/
     public void insertAppSettings(String drug, String choice, long date)
     {
         SQLiteDatabase sqDB= getWritableDatabase();
@@ -165,30 +164,31 @@ public void insertAppSettings(String drug, String choice, long date)
         }
     }
 
+
+    /**Getting Medication Data of Each Day in Day Fragment Activity**/
     public String getMedicationData(int date,int month, int year) {
         SQLiteDatabase sqDB = getReadableDatabase();
         String choice ="daily";
         String[] columns = {"_id", "Date", "Percentage", "Status"};
         String[] selArgs = {"" + month, "" + year, choice};
-        //Log.d(TAGDSH, "INSIDE GET MEDICATION DATA");
+
         StringBuffer buffer = new StringBuffer();
         Cursor cursor = sqDB.query(userMedicationChoiceTable, columns, "Month =? AND Year =? AND Choice =?", selArgs, null, null, null, null);
-        //Cursor cursor = sqDB.rawQuery("SELECT Date,Choice,Status FROM userSettings WHERE Month =? AND Year =?", selArgs);
         int idx0,idx1,idx2;
-        //Log.d(TAGDSH, "MADE QUERY");
 
+         /**Queried for a Month in an Year, stopping when the date required is found**/
         while (cursor.moveToNext()) {
-            //Log.d(TAGDSH,"INSIDE CURSOR");
+
              idx0 = cursor.getColumnIndex("Date");
              idx1 = cursor.getColumnIndex("Percentage");
              idx2 = cursor.getColumnIndex("Status");
             int d= cursor.getInt(idx0);
             String ch = cursor.getString(idx2);
-            //String stat = cursor.getString(idx2);
+
             Log.d(TAGDSH,"Passed Date:"+date+"Found date:"+d);
-            //Log.d(TAGDSH,"INSIDE WHILE OF CURSOR GET MEDICATION DATA");
+
             Log.d(TAGDSH,""+year);
-            //Log.d(TAGDSH,"---"+d+ch+stat);
+
             if(d==date)
             {
                 buffer.append(ch);
@@ -198,6 +198,7 @@ public String getMedicationData(int date,int month, int year) {
         return buffer.toString();
     }
 
+    /**Method to Modify the entry of Each Day**/
     public void updateMedicationEntry(int date, int month, int year, String entry,double percentage){
 
         SQLiteDatabase sqDB = getReadableDatabase();
@@ -206,6 +207,7 @@ public void updateMedicationEntry(int date, int month, int year, String entry,do
         values.put("Percentage", percentage);
         String[] args = new String[]{String.valueOf(date), String.valueOf(month),String.valueOf(year)};
         String[] column = {"Percentage"};
+        /**Update is used instead of Insert, because the entry already exist**/
         sqDB.update(userMedicationChoiceTable, values, "Date=? AND Month=? AND YEAR=?", args);
         Cursor cursor=sqDB.query(userMedicationChoiceTable,column,null,null,null,null,null);
         while(cursor.moveToNext())
@@ -216,7 +218,8 @@ public void updateMedicationEntry(int date, int month, int year, String entry,do
 
     }
 
-    /*Insert the database for the no entry */
+    /*If No Entry will be found it will enter in the database, so that it can be later updated.
+     * Usage is in Day Fragment Activity **/
     public void insertOrUpdateMissedMedicationEntry(int date, int month, int year,double percentage)
     {
         SQLiteDatabase sqDB = this.getWritableDatabase();
@@ -295,7 +298,7 @@ public void insertOrUpdateMissedMedicationEntry(int date, int month, int year,do
 
     }
 
-    /*Is Entered is Used for Getting the Style of Each Calendar Grid Cell According to the Medication*/
+    /*Is Entered is Used for Getting the Style of Each Calendar Grid Cell According to the Medication Status Taken or Not Taken*/
     public int isEntered(int date,int month, int year)
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -322,6 +325,7 @@ else if (status.equalsIgnoreCase("no"))
 
     }
 
+    /**Getting the oldest registered entry of Pill**/
     public long getFirstTime() {
         SQLiteDatabase sqDB = getWritableDatabase();
         String column[]={"Timestamp"};
@@ -347,6 +351,9 @@ public long getFirstTime() {
         return firstRunTime;
     }
 
+    /**Getting the Status of Each Day, like whether the Medicine was taken or not.
+     * Usages in Alert Dialog Fragment for geting the status of pill for setting up Reminder
+     * Usages in Day Fragment Activity for getting the previous status of day before updating it as not taken. **/
     public String getStatus(int date,int month,int year){
 
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -363,7 +370,9 @@ public String getStatus(int date,int month,int year){
     }
 
 
-
+    /**From the Last Time Pill was Taken it Calculates the maximum days in a row medication was taken
+     * Need at Home Screen, First Analytic Scrren, Second Analytic Scrren, Day Fragment Screen
+     * Main Activity for updating the dosesInArow as it changes according to the status we enter.**/
     public int getDosesInaRowDaily()
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -371,6 +380,7 @@ public int getDosesInaRowDaily()
         Cursor cursor= sqDB.query(userMedicationChoiceTable,column,null,null,null,null,"Timestamp DESC");
         int dosesInaRow=0,prevDate=0,currDate=0,currDateMonth=0,prevDateMonth=0,prevDateYear=0,currDateYear=0;
         String ts="";
+        /**One Iteration is done before entering the while loop for updating the previous and current date**/
         if(cursor!=null) {
             cursor.moveToNext();
             if (cursor != null) {
@@ -388,7 +398,8 @@ public int getDosesInaRowDaily()
                         dosesInaRow++;
                 }
 
-
+                /**Since Previous and Current Date our Updated,
+                 * Now backwards scan is done till we receive consecutive previous and current date **/
                 while (cursor != null && cursor.moveToNext()) {
                     currDate = cursor.getInt(2);
                     currDateMonth = cursor.getInt(3);
@@ -422,6 +433,7 @@ public int getDosesInaRowDaily()
         return dosesInaRow;
     }
 
+    /**Method to give no. of days in month. */
     private int getNumberofDaysinMonth(int month,int year)
     {
         if(isLeapYear(year))
@@ -432,16 +444,21 @@ private int getNumberofDaysinMonth(int month,int year)
             return daysOfMonth[month];
     }
 
+    /**Check whether it is a leap layer**/
     private static boolean isLeapYear(int year) {
         Calendar cal = Calendar.getInstance();
         cal.set(Calendar.YEAR, year);
         return cal.getActualMaximum(Calendar.DAY_OF_YEAR) > 365;
     }
 
+    /**From the Last Time Pill was Taken it Calculates the maximum weeks in a row medication was taken
+     * Need at Home Screen, First Analytic Scrren, Second Analytic Scrren, Day Fragment Screen
+     * Main Activity for updating the dosesInArow as it changes according to the status we enter.**/
     public int getDosesInaRowWeekly()
     {
         SQLiteDatabase sqDB = getWritableDatabase();
         String []column={"Status","Timestamp","Date","Month","Year"};
+
         Cursor cursor= sqDB.query(userMedicationChoiceTable,column,null,null,null,null,"Timestamp DESC");
         int dosesInaRow=1,aMonth=0,pMonth=0;
         Date ado,pdo;
@@ -486,6 +503,7 @@ public int getDosesInaRowWeekly()
 
     }
 
+    /*Getting the Date Object from the String**/
     private Date getDateObject(String s)
     {
         Date dobj=null;
@@ -502,6 +520,7 @@ private Date getDateObject(String s)
         return dobj;
     }
 
+    /*Getting the Day of Week from the String**/
     private int getDayofWeek(Date d)
     {
         Calendar cal=Calendar.getInstance();
@@ -510,6 +529,7 @@ private int getDayofWeek(Date d)
         return day;
     }
 
+    /*Getting no. of Days between two interval**/
     private long getNumberOfDays(Date d1,Date d2) {
         long interval = 0;
         Calendar c= Calendar.getInstance();
@@ -522,6 +542,7 @@ private long getNumberOfDays(Date d1,Date d2) {
         return interval;
     }
 
+    /*Setting the Date Object to Human Readable Format**/
     private String getHumanDateFormat(String ats,int aMonth)
     {
         String aYear=ats.substring(0, 4);
@@ -550,6 +571,7 @@ public String getMediLastTakenTime()
         return recentDate;
     }
 
+    /*Deleting the Database*/
     public void resetDatabase()
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -560,6 +582,7 @@ public void resetDatabase()
         sqDB.close();
     }
 
+    /**Inseting the location for maintaining Location History**/
     public void insertLocation(String location)
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -588,6 +611,7 @@ public void insertLocation(String location)
 
     }
 
+    /**Fetching the Location**/
     public Cursor getLocation()
     {
 
@@ -599,6 +623,7 @@ public Cursor getLocation()
                 KEY_ROW_ID + " asc ");
     }
 
+    /**Inserting the Packing Item in DataBase when using Add Item Edit Text**/
     public void insertPackingItem(String pItem,int quantity, String status)
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -633,6 +658,7 @@ public void insertPackingItem(String pItem,int quantity, String status)
 
     }
 
+    /**Fetching the Packing Item to be taken**/
     public Cursor getPackingItemChecked()
     {
 
@@ -647,82 +673,10 @@ public Cursor getPackingItemChecked()
         Cursor cursor = sqDB.query(packingTable,column,"Status= ?",selArgs,null,null,KEY_ROW_ID+" asc ");
 
         return cursor;
-=======
 
-    public void insertAppSettings(String drug, String choice, long date)
-    {
-        SQLiteDatabase sqDB= getWritableDatabase();
-        String [] column={"FirstInstall"};
-        ContentValues cv =new ContentValues(2);
-        Cursor cursor=sqDB.query(appSettingTable,column,null,null,null,null,"_id ASC LIMIT 1");
-        cursor.moveToNext();
-        try {
->>>>>>> ankita-gsoc-gradlebuild
-
-            if (cursor.getString(0).compareTo("true")==0)
-            {
-                cv.put("Drug", drug);
-                cv.put("Choice", choice);
-                cv.put("FirstTime", date);
-                Calendar c =Calendar.getInstance();
-                c.setTimeInMillis(date);
-                int w=c.get(Calendar.DAY_OF_WEEK);
-                cv.put("WeeklyDay",w);
-                cv.put("FreshInstall","true");
-                String [] args={"1"};
-                sqDB.delete(appSettingTable,"_id = ?",args);
-                sqDB.insert(appSettingTable,"settings",cv);
-            }
-
-        }
-        catch(Exception e)
-        {   cv.put("Drug", drug);
-            cv.put("Choice", choice);
-            cv.put("FirstTime", date);
-            Calendar c =Calendar.getInstance();
-            c.setTimeInMillis(date);
-            int w=c.get(Calendar.DAY_OF_WEEK);
-            cv.put("WeeklyDay", w);
-            cv.put("FreshInstall", "true");
-            String [] args={"1"};
-            sqDB.insert(appSettingTable,"settings",cv);
-        }
     }
 
-    public String getMedicationData(int date,int month, int year) {
-        SQLiteDatabase sqDB = getReadableDatabase();
-        String choice ="daily";
-        String[] columns = {"_id", "Date", "Percentage", "Status"};
-        String[] selArgs = {"" + month, "" + year, choice};
-        //Log.d(TAGDSH, "INSIDE GET MEDICATION DATA");
-        StringBuffer buffer = new StringBuffer();
-        Cursor cursor = sqDB.query(userMedicationChoiceTable, columns, "Month =? AND Year =? AND Choice =?", selArgs, null, null, null, null);
-        //Cursor cursor = sqDB.rawQuery("SELECT Date,Choice,Status FROM userSettings WHERE Month =? AND Year =?", selArgs);
-        int idx0,idx1,idx2;
-        //Log.d(TAGDSH, "MADE QUERY");
-
-        while (cursor.moveToNext()) {
-            //Log.d(TAGDSH,"INSIDE CURSOR");
-             idx0 = cursor.getColumnIndex("Date");
-             idx1 = cursor.getColumnIndex("Percentage");
-             idx2 = cursor.getColumnIndex("Status");
-            int d= cursor.getInt(idx0);
-            String ch = cursor.getString(idx2);
-            //String stat = cursor.getString(idx2);
-            Log.d(TAGDSH,"Passed Date:"+date+"Found date:"+d);
-            //Log.d(TAGDSH,"INSIDE WHILE OF CURSOR GET MEDICATION DATA");
-            Log.d(TAGDSH,""+year);
-            //Log.d(TAGDSH,"---"+d+ch+stat);
-            if(d==date)
-            {
-                buffer.append(ch);
-            }
-        }
-        sqDB.close();
-        return buffer.toString();
-    }
-
-<<<<<<< HEAD
+    /**Fetching the list of Packing Item from which one can be chosen**/
     public Cursor getPackingItem()
     {
 
@@ -734,6 +688,8 @@ public Cursor getPackingItem()
 
     }
 
+
+    /**Refreshing the status of each packing item to its original state**/
     public void refreshPackingItemStatus()
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -755,106 +711,17 @@ public void refreshPackingItemStatus()
             catch (Exception e)
             {
                 break;
-=======
-    public void updateMedicationEntry(int date, int month, int year, String entry,double percentage){
-
-        SQLiteDatabase sqDB = getReadableDatabase();
-        ContentValues values = new ContentValues(2);
-        values.put("Status", entry);
-        values.put("Percentage", percentage);
-        String[] args = new String[]{String.valueOf(date), String.valueOf(month),String.valueOf(year)};
-        String[] column = {"Percentage"};
-        sqDB.update(userMedicationChoiceTable, values, "Date=? AND Month=? AND YEAR=?", args);
-        Cursor cursor=sqDB.query(userMedicationChoiceTable,column,null,null,null,null,null);
-        while(cursor.moveToNext())
-        {
-         Log.d(TAGDSH, "Percentage:" + cursor.getDouble(0));
-        }
-        sqDB.close();
-
-    }
-
-    /*Insert the database for the no entry */
-    public void insertOrUpdateMissedMedicationEntry(int date, int month, int year,double percentage)
-    {
-        SQLiteDatabase sqDB = this.getWritableDatabase();
-        ContentValues cv = new ContentValues(2);
-        String Choice="",ts="";
-        if(SharedPreferenceStore.mPrefsStore.getBoolean("com.peacecorps.malaria.isWeekly",false))
-            Choice="weekly";
-        else
-            Choice="daily";
-        if(date>=10)
-            ts=""+year+"-"+month+"-"+date;
-        else
-            ts=""+year+"-"+month+"-0"+date;
-
-        String []columns={"Status"};
-        String []selArgs= {""+date,""+month,""+year};
-        Cursor cursor = sqDB.query(userMedicationChoiceTable, columns, "Date=? AND Month =? AND Year =?", selArgs, null, null, null, null);
-        int idx0; String st=""; int flag=0;
-        while(cursor.moveToNext())
-        {
-            idx0=cursor.getColumnIndex("Status");
-            st=cursor.getString(idx0);
-            flag=1;
-        }
-
-        Log.d(TAGDSH, "" + year);
-        if(flag==0 && st.equalsIgnoreCase(""))
-        {
-            cv.put("Drug", SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drug", 0));
-            cv.put("Choice", Choice);
-            cv.put("Month", "" + month);
-            cv.put("Year", "" + year);
-            cv.put("Date", date);
-            cv.put("Percentage", percentage);
-            cv.put("Timestamp", ts);
-            sqDB.insert(userMedicationChoiceTable, "medicaton", cv);
-
-            String []col ={"Date"};
-            String []arg = {""+month,""+year};
-            Cursor crsr = sqDB.query(userMedicationChoiceTable,col,"Month =? AND Year =?",arg,null,null,"Date ASC");
-            int count=1,p,lim,ft=0;
-            while (cursor.moveToNext())
-            {
-                p = crsr.getInt(0);
-                count++;
-                if(count==1)
-                {
-                    ft=p;
-                }
-                if(count==2)
-                {
-                   lim=p-ft;
-                   for (int i=1;i<lim;i++)
-                   {   if((date+i)>=10)
-                       ts=""+year+"-"+month+"-"+(date+i);
-                       else
-                       ts=""+year+"-"+month+"-0"+(date+i);
-                       cv.put("Drug", SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drug", 0));
-                       cv.put("Choice", Choice);
-                       cv.put("Month", "" + month);
-                       cv.put("Year", "" + year);
-                       cv.put("Date", date+i);
-                       cv.put("Percentage", percentage);
-                       cv.put("Timestamp", ts);
-                       sqDB.insert(userMedicationChoiceTable, "medicaton", cv);
-                   }
-
-                }
-
->>>>>>> ankita-gsoc-gradlebuild
             }
 
 
 
         }
-<<<<<<< HEAD
 
 
     }
 
+
+    /**Finding the No. of Drugs**/
     public int getCountTaken()
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -881,40 +748,12 @@ public int getCountTaken()
         sqDB.close();
         return count;
 
-=======
-        sqDB.close();
-
-    }
-
-    /*Is Entered is Used for Getting the Style of Each Calendar Grid Cell According to the Medication*/
-    public int isEntered(int date,int month, int year)
-    {
-        SQLiteDatabase sqDB = getWritableDatabase();
-        String column[] = {"Status"};
-        String args[] = {""+date,"" + month, ""+year};
-        Cursor cursor = sqDB.query(userMedicationChoiceTable, column, "Date=? AND Month =? AND Year =?", args, null, null, null, null);
-        int idx=0;
-        String status="";
-        while(cursor.moveToNext())
-        {
-            idx = cursor.getColumnIndex("Status");
-            status=cursor.getString(idx);
-            if(status!=null) {
-                if (status.equalsIgnoreCase("yes"))
-                    return 0;
-                else if (status.equalsIgnoreCase("no"))
-                    return 1;
-            }
-
-        }
-        sqDB.close();
-        return 2;
->>>>>>> ankita-gsoc-gradlebuild
 
 
     }
 
-<<<<<<< HEAD
+
+    /**Finding the No. of weekly days between two dates for calculating Adherence**/
     public int getIntervalWeekly(Date s, Date e, int weekday)
     {
         Calendar startCal;
@@ -953,6 +792,7 @@ public int getIntervalWeekly(Date s, Date e, int weekday)
         return medDays;
     }
 
+    /**Finding the No. of days between two dates for calculating adherence of daily drugs**/
     public int getIntervalDaily(Date s,Date e)
     {
         long sLong=s.getTime();
@@ -968,7 +808,7 @@ public int getIntervalDaily(Date s,Date e)
 
     }
 
-
+    /**Finding the Drugs between two dates for updaing Adherence in Day Fragment Activity of any selected date**/
     public int getCountTakenBetween(Date s,Date e)
     {
         SQLiteDatabase sqDB = getWritableDatabase();
@@ -1027,245 +867,10 @@ else if(strt==endt)
         }
         sqDB.close();
         return count;
-=======
-    public long getFirstTime() {
-        SQLiteDatabase sqDB = getWritableDatabase();
-        String column[]={"Timestamp"};
-        Cursor cursor = sqDB.query(userMedicationChoiceTable,column,null,null,null,null,"Timestamp ASC LIMIT 1");
-        int idx=0; String selected_date=""; long firstRunTime=0;
-        while (cursor.moveToNext())
-        {
-            idx=cursor.getColumnIndex("Timestamp");
-            selected_date=cursor.getString(idx);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            Date comp_date=Calendar.getInstance().getTime();
-            try {
-                comp_date   = sdf.parse(selected_date);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            Calendar cal = Calendar.getInstance();
-            cal.setTime(comp_date);
-            firstRunTime=cal.getTimeInMillis();
-        }
-        sqDB.close();
-        return firstRunTime;
-    }
-
-    public String getStatus(int date,int month,int year){
-
-        SQLiteDatabase sqDB = getWritableDatabase();
-        String []column = {"Status"};
-        String []selArgs = {""+date,""+month,""+year};
-        Cursor cursor= sqDB.query(userMedicationChoiceTable,column,"Date =? AND Month =? AND Year =?",selArgs,null,null,null,null);
-
-        while(cursor.moveToNext())
-        {
-            return cursor.getString(0);
-        }
-
-        return "miss";
-    }
-
-
-
-    public int getDosesInaRowDaily()
-    {
-        SQLiteDatabase sqDB = getWritableDatabase();
-        String []column={"Status","Timestamp","Date","Month","Year","Choice"};
-        Cursor cursor= sqDB.query(userMedicationChoiceTable,column,null,null,null,null,"Timestamp DESC");
-        int dosesInaRow=0,prevDate=0,currDate=0,currDateMonth=0,prevDateMonth=0,prevDateYear=0,currDateYear=0;
-        String ts="";
-        if(cursor!=null) {
-            cursor.moveToNext();
-            if (cursor != null) {
-                try {
-                    ts = cursor.getString(cursor.getColumnIndex("Timestamp"));
-                    currDate = cursor.getInt(2);
-                    Log.d(TAGDSH, "curr date 1->" + ts);
-                } catch (Exception e) {
-                    return 0;
-                }
-                if (cursor.getString(0).compareTo("yes") == 0) {
-                    prevDate = cursor.getInt(2);
-                    prevDateMonth = cursor.getInt(3);
-                    if (Math.abs(currDate - prevDate) <= 1)
-                        dosesInaRow++;
-                }
-
-
-                while (cursor != null && cursor.moveToNext()) {
-                    currDate = cursor.getInt(2);
-                    currDateMonth = cursor.getInt(3);
-                    currDateYear = cursor.getInt(4);
-                    ts = cursor.getString(cursor.getColumnIndex("Timestamp"));
-                    Log.d(TAGDSH, "curr date ->" + ts);
-                    int parameter = Math.abs(currDate - prevDate);
-                    if ((cursor.getString(0)) != null) {
-                        if (currDateMonth == prevDateMonth) {
-                            if (cursor.getString(0).compareTo("yes") == 0 && parameter == 1)
-                                dosesInaRow++;
-                            else
-                                break;
-                        } else {
-                            parameter = Math.abs(currDate - prevDate) % (getNumberofDaysinMonth(currDateMonth, currDateYear) - 1);
-                            if (cursor.getString(0).compareTo("yes") == 0 && parameter <= 1)
-                                dosesInaRow++;
-                            else
-                                break;
-
-                        }
-                    }
-                    Log.d(TAGDSH, "Doses in Row->" + dosesInaRow);
-                    prevDate = currDate;
-                    prevDateMonth = currDateMonth;
-                }
-            }
-        }
-        Log.d(TAGDSH, "Doses in Row->" + dosesInaRow);
-        sqDB.close();
-        return dosesInaRow;
-    }
-
-    private int getNumberofDaysinMonth(int month,int year)
-    {
-        if(isLeapYear(year))
-        {
-            return daysOfMonthLeap[month];
-        }
-        else
-            return daysOfMonth[month];
-    }
-
-    private static boolean isLeapYear(int year) {
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.YEAR, year);
-        return cal.getActualMaximum(Calendar.DAY_OF_YEAR) > 365;
-    }
-
-    public int getDosesInaRowWeekly()
-    {
-        SQLiteDatabase sqDB = getWritableDatabase();
-        String []column={"Status","Timestamp","Date","Month","Year"};
-        Cursor cursor= sqDB.query(userMedicationChoiceTable,column,null,null,null,null,"Timestamp DESC");
-        int dosesInaRow=1,aMonth=0,pMonth=0;
-        Date ado,pdo;
-        int pPara=0;
-        long aPara=0;
-        int numDays=0;
-        String ats="",pts="";
-        if(cursor!=null) {
-            cursor.moveToNext();
-            if(cursor!=null) {
-
-                try {
-                    ats = cursor.getString(1);
-                }
-                catch (CursorIndexOutOfBoundsException e)
-                {
-                    return 0;
-                }
-
-                aMonth = cursor.getInt(3) + 1;
-                ats = getHumanDateFormat(ats, aMonth);
-                ado = getDateObject(ats);
-                while (cursor.moveToNext()) {
-                    pts = cursor.getString(1);
-                    pMonth = cursor.getInt(3) + 1;
-                    pts = getHumanDateFormat(pts, pMonth);
-                    pdo = getDateObject(pts);
-                    numDays = getDayofWeek(pdo);
-                    pPara = 7 - numDays + 7;
-                    aPara = getNumberOfDays(pdo, ado);
-                    if (aPara <= pPara)
-                        dosesInaRow++;
-                    else
-                        break;
-                    ats = pts;
-                    ado = pdo;
-                }
-            }
-        }
-        return dosesInaRow;
->>>>>>> ankita-gsoc-gradlebuild
 
 
     }
 
-<<<<<<< HEAD
-
-=======
-    private Date getDateObject(String s)
-    {
-        Date dobj=null;
-
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-        try {
-            dobj= sdf.parse(s);
-        }
-        catch (ParseException e)
-        {
-            e.printStackTrace();
-        }
-
-        return dobj;
-    }
 
-    private int getDayofWeek(Date d)
-    {
-        Calendar cal=Calendar.getInstance();
-        cal.setTime(d);
-        int day=cal.get(Calendar.DAY_OF_WEEK);
-        return day;
-    }
-
-    private long getNumberOfDays(Date d1,Date d2) {
-        long interval = 0;
-        Calendar c= Calendar.getInstance();
-        c.setTime(d1);
-        long ld1 = c.getTimeInMillis();
-        c.setTime(d2);
-        long ld2=c.getTimeInMillis();
-        long oneDay = 1000 * 60 * 60 * 24;
-        interval = (ld2-ld1) / oneDay;
-        return interval;
-    }
-
-    private String getHumanDateFormat(String ats,int aMonth)
-    {
-        String aYear=ats.substring(0, 4);
-        String aDate=ats.substring(Math.max(ats.length() - 2, 0));
-        ats=aYear+"-"+aMonth+"-"+aDate;
-        return ats;
-    }
-
-    public String getMediLastTakenTime()
-    {
-        SQLiteDatabase sqDB=getWritableDatabase();
-        String [] column={"Date","Month","Year"};
-        String recentDate="";
-        Cursor cursor = sqDB.query(userMedicationChoiceTable, column, null, null, null, null, "Timestamp DESC LIMIT 1");
-        if(cursor!=null)
-        { cursor.moveToNext();
-            try
-            {
-                recentDate=cursor.getString(0)+"/"+cursor.getString(1);
-            }
-            catch (Exception e)
-            {
-                return "";
-            }
-        }      sqDB.close();
-        return recentDate;
-    }
-
-    public void resetDatabase()
-    {
-        SQLiteDatabase sqDB = getWritableDatabase();
-        sqDB.delete(userMedicationChoiceTable,null,null);
-        sqDB.delete(appSettingTable,null,null);
-        sqDB.close();
-    }
->>>>>>> ankita-gsoc-gradlebuild
 
 }
\ No newline at end of file
diff --git a/src/com/peacecorps/malaria/DayFragmentActivity.java b/src/com/peacecorps/malaria/DayFragmentActivity.java
index 5106990a..832a166f 100644
--- a/src/com/peacecorps/malaria/DayFragmentActivity.java
+++ b/src/com/peacecorps/malaria/DayFragmentActivity.java
@@ -46,10 +46,7 @@ public class DayFragmentActivity extends FragmentActivity {
     private String ch="";
     private int flag=0;
     private long curr_time=0;
-<<<<<<< HEAD
     private static DatabaseSQLiteHelper sqLite;
-=======
->>>>>>> ankita-gsoc-gradlebuild
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
@@ -63,13 +60,8 @@ public void onCreate(Bundle savedInstanceState) {
                 .getApplicationContext();
         mSharedPreferenceStore.getSharedPreferences(this);
 
-<<<<<<< HEAD
         /*defining variables for accessing Database*/
         sqLite= new DatabaseSQLiteHelper(this);
-=======
-        /*declaring variables for accessing Database*/
-        final DatabaseSQLiteHelper sqLite= new DatabaseSQLiteHelper(this);
->>>>>>> ankita-gsoc-gradlebuild
 
         /*displaying clicked date on the Day Fragment*/
         Intent intent = getIntent();
@@ -132,17 +124,10 @@ else if(data.compareTo("no")==0) {
         {   Log.d(TAGD,"Inside Missed Drug Entry");
 
             selected_date=SharedPreferenceStore.mPrefsStore.getString("com.peacecorps.malaria.checkMediLastTakenTime","");
-<<<<<<< HEAD
             SimpleDateFormat dateF = new SimpleDateFormat("dd/MM");
             Date cd=Calendar.getInstance().getTime();
             try {
                 cd   = dateF.parse(selected_date);
-=======
-            SimpleDateFormat dateF = new SimpleDateFormat("dd/MM/yyyy");
-            Date cd=Calendar.getInstance().getTime();
-            try {
-                cd   = dateFormatter.parse(selected_date);
->>>>>>> ankita-gsoc-gradlebuild
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -192,11 +177,7 @@ else if(data.compareTo("no")==0) {
             @Override
             public void onClick(View v) {
 
-<<<<<<< HEAD
                 final Dialog dialog = new Dialog(con,android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
-=======
-                final Dialog dialog = new Dialog(con);
->>>>>>> ankita-gsoc-gradlebuild
                 dialog.setContentView(R.layout.day_dialog);
                 dialog.setTitle("Medicine Consumption");
 
@@ -220,7 +201,7 @@ public void onClick(View v) {
                         // find the radiobutton by returned id
                         btnRadButton = (RadioButton) dialog.findViewById(selectedId);
 
-
+                        //acting according to the radio button response
                         ch = btnRadButton.getText().toString();
                         Log.d(TAGD, "Radio Button Response-" + ch);
                         if (flag == 0) {
@@ -234,8 +215,7 @@ public void onClick(View v) {
                                 long firstTime = sqLite.getFirstTime();
                                 Log.d(TAGD, "" + SharedPreferenceStore.mPrefsStore.getLong("com.peacecorps.malaria.firstRunTime", 0));
                                 SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria.firstRunTime", firstTime).apply();
-<<<<<<< HEAD
-
+                                //updating adherence
                                 double prcntage = 0.0;
                                 Log.d(TAGD, "Adherence when Yes:" + prcntage);
                                 sqLite.updateMedicationEntry(day, month, year, "yes", prcntage);
@@ -243,13 +223,13 @@ public void onClick(View v) {
                                 Log.d(TAGD, "Getting count:" + sqLite.getCountTaken());
                                 prcntage=computeAdherenceRate(curr_time);
                                 sqLite.updateMedicationEntry(day, month, year, "yes", prcntage);
-
-=======
-                                double prcntage = computeAdherenceRate(curr_time);
-                                Log.d(TAGD, "Adherence when Yes:" + prcntage);
-                                sqLite.updateMedicationEntry(day, month, year, "yes", prcntage);
->>>>>>> ankita-gsoc-gradlebuild
-                                int dosesInaRow=sqLite.getDosesInaRowDaily();
+                                //updating doses in a row
+                                int dosesInaRow = 0;
+                                if (SharedPreferenceStore.mPrefsStore.getBoolean("com.peacecorps.malaria.isWeekly", false)) {
+                                    dosesInaRow = sqLite.getDosesInaRowWeekly();
+                                } else {
+                                    dosesInaRow = sqLite.getDosesInaRowDaily();
+                                }
                                 Log.d(TAGD,"Doses in a Row:"+dosesInaRow);
                                 SharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.dailyDose", dosesInaRow).apply();
                                 indicator.setBackgroundResource(R.drawable.accept_medi_checked_);
@@ -265,16 +245,25 @@ public void onClick(View v) {
                                     int accept_count = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0) - 1;
                                     SharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.drugAcceptedCount", accept_count).apply();
                                 }
+                                //updating adherence
                                 double prcntage = computeAdherenceRate(curr_time);
                                 Log.d(TAGD, "Adherence when No:" + prcntage);
                                 sqLite.updateMedicationEntry(day, month, year, "no", prcntage);
-                                int dosesInaRow = sqLite.getDosesInaRowDaily();
+
+                                //upating doses in a row
+                                int dosesInaRow = 0;
+                                if (SharedPreferenceStore.mPrefsStore.getBoolean("com.peacecorps.malaria.isWeekly", false)) {
+                                    dosesInaRow = sqLite.getDosesInaRowWeekly();
+                                } else {
+                                    dosesInaRow = sqLite.getDosesInaRowDaily();
+                                }
                                 Log.d(TAGD, "Doses in a Row:" + dosesInaRow);
                                 SharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.dailyDose", dosesInaRow).apply();
                                 indicator.setBackgroundResource(R.drawable.reject_medi_checked);
                             } else
                                 dialog.dismiss();
                         } else {
+                            //Future Date is not allowed to Edit
                             Toast.makeText(getApplicationContext(), "You are not allowed to edit!", Toast.LENGTH_LONG).show();
                         }
                         dialog.dismiss();
@@ -294,10 +283,10 @@ public void onClick(View v) {
         });
     }
 
-<<<<<<< HEAD
+    /**Computing the Adherence Rate for selected Date**/
     public double computeAdherenceRate(long day_time) {
         long interval = checkDrugTakenTimeInterval("firstRunTime", day_time);
-        //DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(this.getApplicationContext());
+
         Date e=new Date();
         e.setTime(day_time);
 
@@ -310,9 +299,11 @@ public double computeAdherenceRate(long day_time) {
         return adherenceRate;
     }
 
+
+    /**Finding the Time Interval between two dates**/
     public  long checkDrugTakenTimeInterval(String time,long day_time) {
         long interval = 0;
-        //DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(this.getApplicationContext());
+
         long takenDate = sqLite.getFirstTime();
         if(takenDate!=0) {
             Calendar cal = Calendar.getInstance();
@@ -342,177 +333,7 @@ public  long checkDrugTakenTimeInterval(String time,long day_time) {
              interval=1;
 
         return interval;
-=======
-    public  double computeAdherenceRate(long day_time) {
-        /*long interval = checkDrugTakenTimeInterval("firstRunTime",day_time) + 1;
-        int takenCount = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0);
-        double adherenceRate = ((double)takenCount /(double) interval) * 100;
-        return adherenceRate;*/
-
-        long interval = checkDrugTakenTimeInterval("firstRunTime");
-        int takenCount = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0);
-        double adherenceRate;
-        Log.d(TAGD,"taken Count:"+takenCount);
-        Log.d(TAGD,"INTERVAL:"+ interval);
-        //Log.d(TAGMA,""+ takenCount);
-        if(interval!=1)
-            adherenceRate = ((double)takenCount / (double)interval) * 100;
-        else
-            adherenceRate = 100;
-        Log.d(TAGD,"ADHERENCE RATE:"+adherenceRate);
-
-        return adherenceRate;
     }
 
-    public  long checkDrugTakenTimeInterval(String time) {
-        /*long interval = 0;
-        long takenDate = mSharedPreferenceStore.mPrefsStore.getLong("com.peacecorps.malaria."
-                + time, 0);
-        Log.d(TAGD, time + ":" + takenDate);
-        long oneDay = 1000 * 60 * 60 * 24;
-        interval = (day_time - takenDate) / oneDay;
-        return interval;*/
-
-
-        long interval = 0;
-        long today = new Date().getTime();
-        DatabaseSQLiteHelper sqLite= new DatabaseSQLiteHelper(con);
-        long takenDate= sqLite.getFirstTime();
-        if(time.compareTo("firstRunTime")==0) {
-            if(takenDate!=0) {
-                Log.d(TAGD, "First Run Time at FAF->" + takenDate);
-                SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria."
-                        + time, takenDate).apply();
-                long oneDay = 1000 * 60 * 60 * 24;
-                interval = (today - takenDate) / oneDay;
-                Log.d(TAGD, "TODAY:" + today);
-                Log.d(TAGD,"TAKEN DATE"+takenDate);
-                Log.d(TAGD,"INTERVAL:"+interval);
-                return interval;
-            }
-            else
-                return 1;
-        }
-        else {
-            takenDate=SharedPreferenceStore.mPrefsStore.getLong("com.peacecorps.malaria."
-                    + time, takenDate);
-            long oneDay = 1000 * 60 * 60 * 24;
-            interval = (today - takenDate) / oneDay;
-            return interval;
-        }
->>>>>>> ankita-gsoc-gradlebuild
-    }
-
-
-    /*public void getSharedPreferences() {
-
-        mSharedPreferenceStore.mPrefsStore = getActivity()
-                .getSharedPreferences("com.peacecorps.malaria.storeTimePicked",
-                        Context.MODE_PRIVATE);
-        mSharedPreferenceStore.mEditor = mSharedPreferenceStore.mPrefsStore
-                .edit();
-    }
-
-    public static double computeAdherenceRate() {
-        long interval = checkDrugTakenTimeInterval("firstRunTime") + 1;
-        int takenCount = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0);
-        double adherenceRate = (takenCount / interval) * 100;
-        return adherenceRate;
-    }
-
-    public void saveUsersettings(Boolean state, Boolean isWeekly) {
-        if (isWeekly) {
-            mSharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria.weeklyDate",
-                    new Date().getTime()).commit();
-            mSharedPreferenceStore.mEditor.putBoolean(
-                    "com.peacecorps.malaria.isWeeklyDrugTaken", state).commit();
-        } else {
-            mSharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria.dateDrugTaken",
-                    new Date().getTime()).commit();
-            mSharedPreferenceStore.mEditor.putBoolean("com.peacecorps.malaria.isDrugTaken",
-                    state).commit();
-        }
-        mSharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.drugRejectedCount",
-                drugRejectedCount).commit();
-        mSharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.drugAcceptedCount",
-                mDrugAcceptedCount).commit();
-
-    }
-
-    public void getSettings() {
-        checkDay = mCalendar.get(Calendar.DAY_OF_WEEK);
-        mGetCurrentDate = new SimpleDateFormat("dd/MM/yyyy",
-                Locale.getDefault()).format(mCalendar.getTime());
-        mDrugAcceptedCount = mSharedPreferenceStore.mPrefsStore.getInt(
-                "com.peacecorps.malaria.drugAcceptedCount", 0);
-        drugRejectedCount = mSharedPreferenceStore.mPrefsStore.getInt(
-                "com.peacecorps.malaria.drugRejectedCount", 0);
-        decideDayofWeek(checkDay, mPossibledays);
-    }
-
-    public static long checkDrugTakenTimeInterval(String time) {
-        long interval = 0;
-        long today = new Date().getTime();
-        long takenDate = mSharedPreferenceStore.mPrefsStore.getLong("com.peacecorps.malaria."
-                + time, 0);
-        Log.d(TAGHSF, time + ":" + takenDate);
-        long oneDay = 1000 * 60 * 60 * 24;
-        interval = (today - takenDate) / oneDay;
-        return interval;
-    }
-
-    public void storeMediTimeLastChecked() {
-        CharSequence lastMedicationCheckedTime = "";
-        Calendar c = Calendar.getInstance();
-        lastMedicationCheckedTime = new SimpleDateFormat("dd/MM",
-                Locale.getDefault()).format(c.getTime());
-
-        mSharedPreferenceStore.mEditor.putString(
-                "com.peacecorps.malaria.checkMediLastTakenTime",
-                lastMedicationCheckedTime.toString()).commit();
-    }
-
-    public void changeWeeklyAlarmTime() {
-        int hour = Calendar.getInstance().get(Calendar.HOUR);
-        int minute = Calendar.getInstance().get(Calendar.MINUTE) - 1;
-        getActivity().startService(
-                new Intent(getActivity(), AlarmService.class));
-        mSharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.AlarmHour", hour)
-                .commit();
-        mSharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.AlarmMinute", minute)
-                .commit();
-    }
-
-
-    public String decideDayofWeek(int checkDay, String possibleDays[]) {
-        String currentDayOfWeek = null;
-        switch (checkDay) {
-            case 1:
-                currentDayOfWeek = possibleDays[0];
-                break;
-            case 2:
-                currentDayOfWeek = possibleDays[1];
-                break;
-            case 3:
-                currentDayOfWeek = possibleDays[2];
-                break;
-            case 4:
-                currentDayOfWeek = possibleDays[3];
-                break;
-            case 5:
-                currentDayOfWeek = possibleDays[4];
-                break;
-            case 6:
-                currentDayOfWeek = possibleDays[5];
-                break;
-            case 7:
-                currentDayOfWeek = possibleDays[6];
-                break;
-
-        }
-        return currentDayOfWeek;
-    }*/
-
-
 
 }
diff --git a/src/com/peacecorps/malaria/DrugArrayAdapter.java b/src/com/peacecorps/malaria/DrugArrayAdapter.java
index 3f26283b..7d97bf92 100644
--- a/src/com/peacecorps/malaria/DrugArrayAdapter.java
+++ b/src/com/peacecorps/malaria/DrugArrayAdapter.java
@@ -12,7 +12,7 @@
 import android.widget.TextView;
 
 public class DrugArrayAdapter extends ArrayAdapter<String>{
-
+    /**Customized List Adapter with an Image View on Left and Text View on Right**/
     private final Activity context;
     private final String[] dname;
     private final Integer[] imageId;
@@ -27,6 +27,7 @@ public DrugArrayAdapter(Activity context,
     @Override
     public View getView(int position, View view, ViewGroup parent) {
         LayoutInflater inflater = context.getLayoutInflater();
+        //inflating the customized view
         View rowView= inflater.inflate(R.layout.trip_drug_item, null, true);
         TextView txtTitle = (TextView) rowView.findViewById(R.id.drugItem);
 
diff --git a/src/com/peacecorps/malaria/EffectivenessFragmentActivity.java b/src/com/peacecorps/malaria/EffectivenessFragmentActivity.java
index ad4ddc5c..b8afdf6f 100644
--- a/src/com/peacecorps/malaria/EffectivenessFragmentActivity.java
+++ b/src/com/peacecorps/malaria/EffectivenessFragmentActivity.java
@@ -1,10 +1,7 @@
 package com.peacecorps.malaria;
 
 import android.app.ProgressDialog;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
@@ -33,11 +30,7 @@
  */
 public class EffectivenessFragmentActivity extends FragmentActivity{
 
-<<<<<<< HEAD
     private TextView mEffectivenessLabel,mETitle;
-=======
-    private TextView mEffectivenessLabel;
->>>>>>> ankita-gsoc-gradlebuild
 
     private static String TAGE = EffectivenessFragmentActivity.class.getSimpleName();
 
@@ -57,29 +50,23 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.effectiveness_fragment);
 
         mEffectivenessLabel = (TextView) findViewById(R.id.effectivenessLabel);
-<<<<<<< HEAD
         mETitle = (TextView)findViewById(R.id.eam);
-=======
->>>>>>> ankita-gsoc-gradlebuild
-
+        //"Please Wait..." Progress Dialog
         progressDialog = new ProgressDialog(this);
         progressDialog.setMessage("Please wait...");
         progressDialog.setCancelable(false);
 
-//mking json object Request
+        //mking json object Request
         Log.i(TAGE, "INSIDE EFFECTIVENESS");
-<<<<<<< HEAD
         mEffectivenessLabel.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
         mETitle.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
-=======
->>>>>>> ankita-gsoc-gradlebuild
         makeJsonObjectRequest();
     }
     private void makeJsonObjectRequest(){
         Log.i(TAGE, "INSIDE JSON OBJECT REQUEST");
         showpDialog(); //progress dialog shows loading...while the data is being fetched
 
-        //making a JSON Object  Request below
+        //making a authenticated JSON Object  Request below
         AuthJSONObjectRequest jsonObjReq = new AuthJSONObjectRequest(Request.Method.GET, urlJsonObj, null
                 , new Response.Listener<JSONObject>() {
             @Override
@@ -123,7 +110,7 @@ public void onResponse(JSONObject response) {
             public void onErrorResponse(VolleyError error) {
                 VolleyLog.d(TAGE, "Error: " + error.getMessage());
                 Toast.makeText(getApplicationContext(), "Error Retreiving Data! Loading from cache... ", Toast.LENGTH_LONG).show();
-
+                //cache implementation
                 BufferedReader input = null;
                 File file = null;
                 try {
diff --git a/src/com/peacecorps/malaria/FirstAnalyticFragment.java b/src/com/peacecorps/malaria/FirstAnalyticFragment.java
index b3e04b5b..ff35d9c3 100755
--- a/src/com/peacecorps/malaria/FirstAnalyticFragment.java
+++ b/src/com/peacecorps/malaria/FirstAnalyticFragment.java
@@ -16,10 +16,7 @@
 import android.widget.TextView;
 import com.peacecorps.malaria.R;
 
-<<<<<<< HEAD
 import java.util.Calendar;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import java.util.Date;
 
 
@@ -34,10 +31,7 @@ public class FirstAnalyticFragment extends Fragment {
     private Button mSettingsButton;
     private String TAGFAF = "FirstAnalyticFragment";
     private Dialog dialog = null;
-<<<<<<< HEAD
     private TextView mlt,dinr,atm;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
 
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -45,39 +39,27 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         rootView = inflater
                 .inflate(R.layout.fragment_first_analytic_screen, null);
 
-
+        //declaring views
         mSettingsButton = (Button) rootView.findViewById(R.id.fragment_first_screen_settings_button);
         checkMediLastTakenTime = (TextView) rootView.findViewById(R.id.checkMediLastTakenTime);
         doses = (TextView) rootView.findViewById(R.id.doses);
         adherence = (TextView) rootView.findViewById(R.id.adherence);
         updateUI();
-<<<<<<< HEAD
         mlt=(TextView)rootView.findViewById(R.id.mlt);
         dinr=(TextView)rootView.findViewById(R.id.dinr);
         atm=(TextView)rootView.findViewById(R.id.atm);
-
+        //setting fonts
         Typeface cf = Typeface.createFromAsset(getActivity().getAssets(), "fonts/garreg.ttf");
         Typeface cfb = Typeface.createFromAsset(getActivity().getAssets(), "fonts/garbold.ttf");
         mlt.setTypeface(cf);
         dinr.setTypeface(cf);
         atm.setTypeface(cf);
 
-=======
-
 
         return rootView;
 
     }
->>>>>>> ankita-gsoc-gradlebuild
-
-    @Override
-    public void onResume(){
-        updateUI();
-        super.onResume();
-
-    }
 
-<<<<<<< HEAD
     @Override
     public void onResume(){
         updateUI();
@@ -85,11 +67,9 @@ public void onResume(){
 
     }
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
     public void updateUI(){
 
-
+        //calling functions
         updateMediLastTime();
         Log.d(TAGFAF,"AFTER CHK MEDI LAST TIME");
         if (checkMediLastTakenTime != null)
@@ -110,11 +90,6 @@ public void addButtonListeners() {
             @Override
             public void onClick(View v) {
 
-<<<<<<< HEAD
-=======
-                mSharedPreferenceStore.mEditor.putBoolean(
-                        "com.peacecorps.malaria.hasUserSetPreference", false).commit();
->>>>>>> ankita-gsoc-gradlebuild
                 addDialog();
 
             }
@@ -132,42 +107,29 @@ public void getSharedPreferences() {
 
 
     public long checkDrugTakenTimeInterval(String time) {
-
+        //finding the interval of time between today and the 'time'
         long interval = 0;
         long today = new Date().getTime();
-<<<<<<< HEAD
         Date tdy= Calendar.getInstance().getTime();
         tdy.setTime(today);
-=======
->>>>>>> ankita-gsoc-gradlebuild
         DatabaseSQLiteHelper sqLite= new DatabaseSQLiteHelper(getActivity());
         long takenDate= sqLite.getFirstTime();
         if(time.compareTo("firstRunTime")==0) {
             if(takenDate!=0) {
                 Log.d(TAGFAF, "First Run Time at FAF->" + takenDate);
-<<<<<<< HEAD
                 Calendar cal=Calendar.getInstance();
                 cal.setTimeInMillis(takenDate);
                 cal.add(Calendar.MONTH, 1);
                 Date start=cal.getTime();
                 int weekDay=cal.get(Calendar.DAY_OF_WEEK);
+                //calaculating no. of weekdays for weekly drug
                 if(SharedPreferenceStore.mPrefsStore.getBoolean("com.peacecorps.malaria.isWeekly",false))
                     interval=sqLite.getIntervalWeekly(start,tdy,weekDay);
                 else
                     interval=sqLite.getIntervalDaily(start,tdy);
+                //^for daily drug only the no. of days
                 SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria."
                         + time, takenDate).apply();
-                /*long oneDay = 1000 * 60 * 60 * 24;
-                interval = (today - takenDate) / oneDay;*/
-=======
-                SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria."
-                        + time, takenDate).apply();
-                long oneDay = 1000 * 60 * 60 * 24;
-                interval = (today - takenDate) / oneDay;
-                Log.d(TAGFAF, "TODAY:" + today);
-                Log.d(TAGFAF,"TAKEN DATE"+takenDate);
-                Log.d(TAGFAF,"INTERVAL:"+interval);
->>>>>>> ankita-gsoc-gradlebuild
                 return interval;
             }
             else
@@ -184,20 +146,12 @@ public long checkDrugTakenTimeInterval(String time) {
 
     public void updateAdherence(){
 
+        /**Calculating Adherence**/
         long interval = checkDrugTakenTimeInterval("firstRunTime");
-<<<<<<< HEAD
         DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(getActivity());
         long takenCount = sqLite.getCountTaken();
         double adherenceRate;
         Log.d(TAGFAF,"taken Count:"+takenCount);
-        //Log.d(TAGMA,""+ interval);
-=======
-        int takenCount = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0);
-        double adherenceRate;
-        Log.d(TAGFAF,"taken Count:"+takenCount);
-        Log.d(TAGFAF,"INTERVAL:"+ interval);
->>>>>>> ankita-gsoc-gradlebuild
-        //Log.d(TAGMA,""+ takenCount);
         if(interval!=1)
             adherenceRate = ((double)takenCount / (double)interval) * 100;
         else
@@ -205,25 +159,19 @@ public void updateAdherence(){
 
         String ar = String.format("%.2f %%", adherenceRate);
         Log.d(TAGFAF,"Adherence Rate:"+ar);
-<<<<<<< HEAD
         //adherence.setText(ar);
-=======
-        adherence.setText(ar);
->>>>>>> ankita-gsoc-gradlebuild
 
     }
 
     public void updateDoses()
-    {   DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(getActivity());
+    {
+        /*Updating Doses in a Row for Weekly and Daily Pill Seperately*/
+        DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(getActivity());
         Log.d(TAGFAF, "INSIDE updateDoses");
         if(mSharedPreferenceStore.mPrefsStore.getBoolean("com.peacecorps.malaria.isWeekly",false)) {
             int d = sqLite.getDosesInaRowWeekly();
             mSharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.weeklyDose", d).apply();
-<<<<<<< HEAD
             doses.setText("" + d/*mSharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.weeklyDose", 0)*/);
-=======
-            doses.setText("" + mSharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.weeklyDose", 0));
->>>>>>> ankita-gsoc-gradlebuild
         }
         else
         {
@@ -234,18 +182,15 @@ public void updateDoses()
     }
 
     public void updateMediLastTime() {
+        /*Updating the most recent time medication was taken*/
         if (checkMediLastTakenTime != null) {
             checkMediLastTakenTime.setText(mSharedPreferenceStore.mPrefsStore.getString("com.peacecorps.malaria.checkMediLastTakenTime", "").toString());
         }
     }
 
     public void addDialog()
-    {
-<<<<<<< HEAD
+    {   /*Opens the Reset Dialog*/
         dialog = new Dialog(this.getActivity(),android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
-=======
-        dialog = new Dialog(this.getActivity());
->>>>>>> ankita-gsoc-gradlebuild
         dialog.setContentView(R.layout.resetdata_dialog);
         dialog.setTitle("Reset Data");
 
@@ -265,7 +210,7 @@ public void onClick(View v) {
                 String ch = btnRadButton.getText().toString();
 
                 if(ch.equalsIgnoreCase("yes"))
-                {
+                {   //if yes, reset the database
                     DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(getActivity());
                     sqLite.resetDatabase();
                     mSharedPreferenceStore.mEditor.clear().commit();
diff --git a/src/com/peacecorps/malaria/FragmentAdapter.java b/src/com/peacecorps/malaria/FragmentAdapter.java
index 500fd060..a795c4b8 100755
--- a/src/com/peacecorps/malaria/FragmentAdapter.java
+++ b/src/com/peacecorps/malaria/FragmentAdapter.java
@@ -6,6 +6,8 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 
+/**Usd for creating sliding Fragment Screen after the the Home Screen**/
+
 public class FragmentAdapter extends FragmentStatePagerAdapter implements
         IconPagerAdapter {
 
@@ -22,7 +24,7 @@ public int getIconResId(int index) {
 
     @Override
     public Fragment getItem(int position) {
-
+        //Deciding the fragment on the basis of position no.
         Fragment fragment = new HomeScreenFragment();
         switch (position) {
             case 0:
@@ -42,7 +44,7 @@ public Fragment getItem(int position) {
 
     @Override
     public int getCount() {
-
+        //total no. of fragments
         return 3;
     }
 
diff --git a/src/com/peacecorps/malaria/HTTPAsyncTask.java b/src/com/peacecorps/malaria/HTTPAsyncTask.java
index 316826c6..d836fa1e 100644
--- a/src/com/peacecorps/malaria/HTTPAsyncTask.java
+++ b/src/com/peacecorps/malaria/HTTPAsyncTask.java
@@ -18,6 +18,10 @@
 /**
  * Created by Ankita on 6/12/2015.
  */
+
+/*
+* Will be used for checking continuous connectivity of Info Hub with Internet
+* */
 public class HTTPAsyncTask extends AsyncTask<String, Void, String> {
 
     Context syncontext;
@@ -27,12 +31,6 @@ public HTTPAsyncTask(Context syncontext)
         this.syncontext=syncontext;
     }
 
-
-    /*protected void onPreExecute(String res)
-    {
-        Log.i(TAGHAT,"INSIDE ON POST EXECUTE");
-        Log.i("Status : ",result);
-    }*/
     @Override
     protected String doInBackground(String... urls) {
        Log.i(TAGHAT, "INSIDE DO IN BACKGROUND");
diff --git a/src/com/peacecorps/malaria/HomeScreenFragment.java b/src/com/peacecorps/malaria/HomeScreenFragment.java
index d9baea5d..a83be063 100755
--- a/src/com/peacecorps/malaria/HomeScreenFragment.java
+++ b/src/com/peacecorps/malaria/HomeScreenFragment.java
@@ -78,12 +78,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
     public double computeAdherenceRate() {
         long interval = checkDrugTakenTimeInterval("firstRunTime");
-<<<<<<< HEAD
         DatabaseSQLiteHelper sqLite = new DatabaseSQLiteHelper(this.getActivity());
         long takenCount = sqLite.getCountTaken();
-=======
-        int takenCount = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0);
->>>>>>> ankita-gsoc-gradlebuild
         double adherenceRate = ((double)takenCount / (double)interval) * 100;
         Log.d(TAGHSF, "adherence:" + adherenceRate);
         return adherenceRate;
@@ -95,11 +91,6 @@ public void addButtonListeners() {
             @Override
             public void onClick(View v) {
 
-<<<<<<< HEAD
-=======
-                mSharedPreferenceStore.mEditor.putBoolean(
-                        "com.peacecorps.malaria.hasUserSetPreference", false).commit();
->>>>>>> ankita-gsoc-gradlebuild
                 addDialog();
 
             }
@@ -181,15 +172,12 @@ public void createView() {
         mCurrentDateLabel.setText(mGetCurrentDate);
         mCurrentDayOfweekLabel
                 .setText(decideDayofWeek(checkDay, mPossibledays));
-<<<<<<< HEAD
 
         Typeface custom_font = Typeface.createFromAsset(getActivity().getAssets(), "fonts/garreg.ttf");
         mCurrentDayOfweekLabel.setTypeface(custom_font);
         mCurrentDateLabel.setTypeface(custom_font);
         mCurrentDayOfweekLabel.setTextSize(50);
         mCurrentDateLabel.setTextSize(20);
-=======
->>>>>>> ankita-gsoc-gradlebuild
         //checkMediLastTakenTime = (TextView) rootView.findViewById(R.id.checkMediLastTakenTime);
 
     }
@@ -304,7 +292,6 @@ public long checkDrugTakenTimeInterval(String time) {
         if(time.compareTo("firstRunTime")==0) {
             if(takenDate!=0) {
                 Log.d(TAGHSF, "First Run Time at FAF->" + takenDate);
-<<<<<<< HEAD
                 Calendar cal = Calendar.getInstance();
                 cal.setTimeInMillis(takenDate);
                 cal.add(Calendar.MONTH, 1);
@@ -324,12 +311,6 @@ public long checkDrugTakenTimeInterval(String time) {
 
                 /*long oneDay = 1000 * 60 * 60 * 24;
                 interval = (today - takenDate) / oneDay;*/
-=======
-                SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria."
-                        + time, takenDate).apply();
-                long oneDay = 1000 * 60 * 60 * 24;
-                interval = (today - takenDate) / oneDay;
->>>>>>> ankita-gsoc-gradlebuild
                 return interval;
             }
             else
@@ -454,11 +435,7 @@ public void missedDayRecord(int day, int month, int year){
 
     public void addDialog()
     {
-<<<<<<< HEAD
         dialog = new Dialog(this.getActivity(),android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
-=======
-        dialog = new Dialog(this.getActivity());
->>>>>>> ankita-gsoc-gradlebuild
         dialog.setContentView(R.layout.resetdata_dialog);
         dialog.setTitle("Reset Data");
 
diff --git a/src/com/peacecorps/malaria/InfoHubFragmentActivity.java b/src/com/peacecorps/malaria/InfoHubFragmentActivity.java
index 81017571..96a97cd5 100644
--- a/src/com/peacecorps/malaria/InfoHubFragmentActivity.java
+++ b/src/com/peacecorps/malaria/InfoHubFragmentActivity.java
@@ -3,10 +3,7 @@
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
@@ -27,10 +24,7 @@ public class InfoHubFragmentActivity extends FragmentActivity {
 
     Button homeIconButton, btnPeaceCorpsPolicy, btnPercentSideEffects, btnSideEffectsPCV,
             btnSideEffectsNPCV, btnVolunteerAdherence, btnEffectiveness,btnTripIndicator,btnSettings;
-<<<<<<< HEAD
     TextView ihLabel;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
         private Dialog dialog = null;
     static SharedPreferenceStore mSharedPreferenceStore;
@@ -43,8 +37,6 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.info_hub_screen);
 
         /*internetIsConnected = (TextView)findViewById(R.id.internetIsConnected);
-<<<<<<< HEAD
-=======
 
         // check if you are connected or not
         if(isConnected()){
@@ -54,16 +46,8 @@ public void onCreate(Bundle savedInstanceState) {
         else{
             internetIsConnected.setText("You are NOT connected");
         }*/
->>>>>>> ankita-gsoc-gradlebuild
 
-        // check if you are connected or not
-        if(isConnected()){
-            internetIsConnected.setBackgroundColor(0xFF00CC00);
-            internetIsConnected.setText("Internet Connected");
-        }
-        else{
-            internetIsConnected.setText("You are NOT connected");
-        }*/
+        /**Declaring Views**/
         ihLabel= (TextView)findViewById(R.id.ih);
         homeIconButton = (Button) findViewById(R.id.homeButton);
         btnTripIndicator = (Button) findViewById(R.id.tripButton);
@@ -74,12 +58,10 @@ public void onCreate(Bundle savedInstanceState) {
         btnVolunteerAdherence = (Button) findViewById(R.id.btnVolunteerAdherence);
         btnEffectiveness = (Button) findViewById(R.id.btnEffectiveness);
         btnSettings = (Button)findViewById(R.id.info_hub_settings_button);
-<<<<<<< HEAD
 
+        /**Setting fonts**/
         Typeface cf = Typeface.createFromAsset(getAssets(),"fonts/garreg.ttf");
         ihLabel.setTypeface(cf);
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
         addListeners();
 
@@ -88,7 +70,7 @@ public void onCreate(Bundle savedInstanceState) {
 
     public void addListeners() {
 
-
+        /**Calling Each of the Posts by 6 different buttons**/
         homeIconButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -151,37 +133,13 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
 
-<<<<<<< HEAD
-=======
-                //startActivity(new Intent(getApplication().getApplicationContext(), UserMedicineSettingsFragmentActivity.class));
-
->>>>>>> ankita-gsoc-gradlebuild
                 addDialog();
             }
         });
 
-<<<<<<< HEAD
-=======
     }
 
 
-    public boolean isConnected(){
-        ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Activity.CONNECTIVITY_SERVICE);
-        NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
-        if (networkInfo != null && networkInfo.isConnected())
-            return true;
-        else
-            return false;
->>>>>>> ankita-gsoc-gradlebuild
-    }
-
-    public void addDialog()
-    {
-        dialog = new Dialog(InfoHubFragmentActivity.this);
-        dialog.setContentView(R.layout.resetdata_dialog);
-        dialog.setTitle("Reset Data");
-
-<<<<<<< HEAD
     /*public boolean isConnected(){
         ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Activity.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
@@ -193,12 +151,11 @@ public void addDialog()
 
     public void addDialog()
     {
+        /**Reset Dialog**/
         dialog = new Dialog(InfoHubFragmentActivity.this,android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
         dialog.setContentView(R.layout.resetdata_dialog);
         dialog.setTitle("Reset Data");
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
         final RadioGroup btnRadGroup = (RadioGroup) dialog.findViewById(R.id.radioGroupReset);
         Button btnOK = (Button) dialog.findViewById(R.id.dialogButtonOKReset);
 
diff --git a/src/com/peacecorps/malaria/MainActivity.java b/src/com/peacecorps/malaria/MainActivity.java
index 053825bd..14cb5a23 100755
--- a/src/com/peacecorps/malaria/MainActivity.java
+++ b/src/com/peacecorps/malaria/MainActivity.java
@@ -47,7 +47,9 @@ public void onClick(View v) {
         });
         Log.d(TAGMA, "Info Hub Button initialized");
 
-
+        /*Method opens the Plan My Trip
+        *Tiny 'bus' symbol in the Setup Screen is Plan My Trip Button
+        */
         mTripButton = (Button) findViewById(R.id.tripButton);
         mTripButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -58,7 +60,7 @@ public void onClick(View v) {
         });
 
         mAdapter = new FragmentAdapter(getSupportFragmentManager());
-
+        /**Setting the Fragments**/
         mPager = (ViewPager) findViewById(R.id.vPager);
         mPager.setAdapter(mAdapter);
         Log.d(TAGMA, "Adapter Set");
@@ -70,7 +72,11 @@ public void onClick(View v) {
 
             @Override
             public void onPageSelected(int position) {
-
+                /**Setting the Values according to the User Input
+                 * Medication Last Time
+                 * Doses in A Row
+                 * Adherence
+                 * **/
                 if (position == 1) {
 
                     Log.d(TAGMA,"Keeping Date");
@@ -85,11 +91,7 @@ public void onPageSelected(int position) {
                         int currentDose = 0,dosesInaRow=0;
                         if (SharedPreferenceStore.mPrefsStore.getBoolean(
                                 "com.peacecorps.malaria.isWeekly", false)) {
-<<<<<<< HEAD
                             dosesInaRow =sqLite.getDosesInaRowWeekly();
-=======
-                            dosesInaRow=sqLite.getDosesInaRowDaily();
->>>>>>> ankita-gsoc-gradlebuild
                             SharedPreferenceStore.mEditor.putInt("com.peacecorps.malaria.weeklyDose", dosesInaRow).apply();
                             currentDose = dosesInaRow;
                             Log.d(TAGMA, "Weekly");
@@ -105,31 +107,16 @@ public void onPageSelected(int position) {
 
                         Log.d(TAGMA,"Calculating Adherence");
                         long interval = checkDrugTakenTimeInterval("firstRunTime");
-<<<<<<< HEAD
                         int takenCount = sqLite.getCountTaken();
                         double adherenceRate;
                         Log.d(TAGMA,""+ interval);
                         Log.d(TAGMA,""+ takenCount);
-=======
-                        int takenCount = SharedPreferenceStore.mPrefsStore.getInt("com.peacecorps.malaria.drugAcceptedCount", 0);
-                        double adherenceRate;
-                        Log.d(TAGMA,"INTERVAL:"+ interval);
-                        Log.d(TAGMA,"TAKEN COUNT:"+ takenCount);
->>>>>>> ankita-gsoc-gradlebuild
                         if(interval!=0)
                             adherenceRate = ((double)takenCount / (double)interval) * 100;
                         else
                             adherenceRate = 100;
-<<<<<<< HEAD
                         String ar=String.format("%.1f ",adherenceRate);
                         FirstAnalyticFragment.adherence.setText("" + ar + "%");
-=======
-                        String ar=String.format("%.2f ",adherenceRate);
-                        //FirstAnalyticFragment.adherence.setText("" + ar + "%");
-
-
-
->>>>>>> ankita-gsoc-gradlebuild
                     }
 
                 }
@@ -149,22 +136,18 @@ public void onPageScrolled(int i, float v, int i2) {
         });
 
     }
-
+    /*Calculating Interval between two time*/
     public long checkDrugTakenTimeInterval(String time) {
 
         long interval = 0;
         long today = new Date().getTime();
-<<<<<<< HEAD
         Date tdy= Calendar.getInstance().getTime();
         tdy.setTime(today);
-=======
->>>>>>> ankita-gsoc-gradlebuild
         DatabaseSQLiteHelper sqLite= new DatabaseSQLiteHelper(this);
         long takenDate= sqLite.getFirstTime();
         if(time.compareTo("firstRunTime")==0) {
             if(takenDate!=0) {
                 Log.d(TAGMA, "First Run Time at FAF->" + takenDate);
-<<<<<<< HEAD
                 Calendar cal=Calendar.getInstance();
                 cal.setTimeInMillis(takenDate);
                 cal.add(Calendar.MONTH, 1);
@@ -178,14 +161,6 @@ public long checkDrugTakenTimeInterval(String time) {
                         + time, takenDate).apply();
                 /*long oneDay = 1000 * 60 * 60 * 24;
                 interval = (today - takenDate) / oneDay;*/
-=======
-                SharedPreferenceStore.mEditor.putLong("com.peacecorps.malaria."
-                        + time, takenDate).apply();
-                long oneDay = 1000 * 60 * 60 * 24;
-                Log.d(TAGMA,"TODAY:"+today);
-                Log.d(TAGMA,"TAKEN DATE"+takenDate);
-                interval = (today - takenDate) / oneDay;
->>>>>>> ankita-gsoc-gradlebuild
                 return interval;
             }
             else
diff --git a/src/com/peacecorps/malaria/PeaceCorpsPolicyFragmentActivity.java b/src/com/peacecorps/malaria/PeaceCorpsPolicyFragmentActivity.java
index 63d818e8..0c191702 100644
--- a/src/com/peacecorps/malaria/PeaceCorpsPolicyFragmentActivity.java
+++ b/src/com/peacecorps/malaria/PeaceCorpsPolicyFragmentActivity.java
@@ -1,10 +1,7 @@
 package com.peacecorps.malaria;
 
 import android.app.ProgressDialog;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
@@ -30,10 +27,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Authenticator;
-<<<<<<< HEAD
 import java.net.FileNameMap;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import java.net.PasswordAuthentication;
 
 /**
@@ -59,18 +53,6 @@ public class PeaceCorpsPolicyFragmentActivity extends FragmentActivity {
 
 
 
-    private static String TAGPCP = PeaceCorpsPolicyFragmentActivity.class.getSimpleName();
-
-    private ProgressDialog progressDialog;
-
-    //json object response url
-    private String urlJsonObj = "http://pc-web-dev.systers.org/api/posts/1/?format=json";
-
-    // temporary string to show the parsed response
-    private String jsonResponse;
-
-
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -78,11 +60,8 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.peace_corps_policy_fragment);
 
         mPeaceCorpsPolicyLabel = (TextView) findViewById(R.id.peaceCorpsPolicyLabel);
-<<<<<<< HEAD
         pcp = (TextView) findViewById(R.id.pcp);
-=======
->>>>>>> ankita-gsoc-gradlebuild
-
+        //"Please Wait" progress dialog
         progressDialog = new ProgressDialog(this);
         progressDialog.setMessage("Please wait...");
         progressDialog.setCancelable(false);
@@ -90,12 +69,10 @@ public void onCreate(Bundle savedInstanceState) {
         //mking json object Request
         Log.i(TAGPCP, "INSIDE PEACE CORPS ACTIVITY");
 
-<<<<<<< HEAD
+        //setting font
         mPeaceCorpsPolicyLabel.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
         pcp.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
         /*HTTPAsyncTask conTask =new HTTPAsyncTask(this);
         conTask.execute("http://pc-web-dev.systers.org");*/
 
@@ -107,7 +84,7 @@ private void makeJsonObjectRequest(){
         Log.i(TAGPCP, "INSIDE JSON OBJECT REQUEST");
         showpDialog(); //progress dialog shows loading...while the data is being fetched
 
-        //making a JSON Object  Request below
+        //making an authenticated JSON Object  Request below
         AuthJSONObjectRequest jsonObjReq = new AuthJSONObjectRequest(Request.Method.GET, urlJsonObj, null
                 , new Response.Listener<JSONObject>() {
             @Override
diff --git a/src/com/peacecorps/malaria/PercentSideEffectsFragmentActivity.java b/src/com/peacecorps/malaria/PercentSideEffectsFragmentActivity.java
index 2614b5cc..63ae0d39 100644
--- a/src/com/peacecorps/malaria/PercentSideEffectsFragmentActivity.java
+++ b/src/com/peacecorps/malaria/PercentSideEffectsFragmentActivity.java
@@ -1,10 +1,7 @@
 package com.peacecorps.malaria;
 
 import android.app.ProgressDialog;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
@@ -33,12 +30,8 @@
  */
 public class PercentSideEffectsFragmentActivity extends FragmentActivity {
 
-
-<<<<<<< HEAD
+    //views and dialogs
     private TextView mPercentSideEffectsLabel,pse;
-=======
-    private TextView mPercentSideEffectsLabel;
->>>>>>> ankita-gsoc-gradlebuild
 
     private static String TAGPSE = PercentSideEffectsFragmentActivity.class.getSimpleName();
 
@@ -53,15 +46,13 @@ public class PercentSideEffectsFragmentActivity extends FragmentActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        //views
         setContentView(R.layout.side_effects_percentage_fragment);
 
         mPercentSideEffectsLabel = (TextView) findViewById(R.id.percentSideEffectsLabel);
-<<<<<<< HEAD
         pse=(TextView)findViewById(R.id.pse);
-=======
 
->>>>>>> ankita-gsoc-gradlebuild
+        //"Please Wait" progress Dialog
         progressDialog = new ProgressDialog(this);
         progressDialog.setMessage("Please wait...");
         progressDialog.setCancelable(false);
@@ -69,11 +60,9 @@ public void onCreate(Bundle savedInstanceState) {
         //mking json object Request
         Log.i(TAGPSE, "INSIDE PERCENTAGE SIDE EFECTS");
 
-<<<<<<< HEAD
+        //setting fonts
         mPercentSideEffectsLabel.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
         pse.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
         makeJsonObjectRequest();
 
@@ -126,7 +115,7 @@ public void onResponse(JSONObject response) {
             public void onErrorResponse(VolleyError error) {
                 VolleyLog.e("Error: ",error.getMessage());
                 Toast.makeText(getApplicationContext(), "Error Retreiving Data! Loading from cache... ", Toast.LENGTH_LONG).show();
-
+                //offline caching
                 BufferedReader input = null;
                 File file = null;
                 try {
diff --git a/src/com/peacecorps/malaria/SecondAnalyticFragment.java b/src/com/peacecorps/malaria/SecondAnalyticFragment.java
index f10c41b2..d22cebcf 100755
--- a/src/com/peacecorps/malaria/SecondAnalyticFragment.java
+++ b/src/com/peacecorps/malaria/SecondAnalyticFragment.java
@@ -6,10 +6,7 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
@@ -28,7 +25,9 @@
 
 import java.util.Calendar;
 import java.util.Locale;
-
+/**Second Analytic Fragment
+ * It shows the Progress Bars and Graph
+ * **/
 public class SecondAnalyticFragment extends Fragment {
 
     private TextView firstMonthProgressLabel, secondMonthProgressLabel, thirdMonthProgressLabel, fourthMonthProgressLabel;
@@ -52,14 +51,12 @@ public class SecondAnalyticFragment extends Fragment {
     private int date;
     private String choice;
     private Dialog dialog = null;
-<<<<<<< HEAD
 
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
+        //Declaring the Views
         rootView = inflater.inflate(R.layout.fragment_second_analytic_screen,
                 null);
 
@@ -84,7 +81,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         Calendar cal = Calendar.getInstance();
 
         date = Calendar.getInstance().get(Calendar.MONTH);
-        //choice;
+        //checking choic of pill whether weekly or daily
         if (mSharedPreferenceStore.mPrefsStore.getBoolean(
                 "com.peacecorps.malaria.isWeekly", false)) {
             choice = "weekly";
@@ -109,6 +106,7 @@ public void onResume() {
     int mdate;
     int myear;
 
+    //finding month from its integer
     public String getMonth(int date) {
         String month[] = getResources().getStringArray(R.array.month);
         if (date == 0) {
@@ -125,23 +123,18 @@ public String getMonth(int date) {
         mdate = date;
         return month[date];
     }
-
+    /*Opening Dialog on Clicking Gear Icon*/
     public void addButtonListeners() {
         mSettingsButton.setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View v) {
 
-<<<<<<< HEAD
-=======
-                mSharedPreferenceStore.mEditor.putBoolean(
-                        "com.peacecorps.malaria.hasUserSetPreference", false).commit();
->>>>>>> ankita-gsoc-gradlebuild
                 addDialog();
 
             }
         });
-
+        /*On Clicking the Progress Bars Opens Calendar of that Specific Month*/
         firstMonthProgressBar.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -189,7 +182,7 @@ public void onClick(View v) {
             }
         });
     }
-
+    /*Fetching the Details and Settings from Shared Preferences*/
     public void getSharedPreferences() {
 
         mSharedPreferenceStore.mPrefsStore = getActivity()
@@ -199,26 +192,26 @@ public void getSharedPreferences() {
                 .edit();
     }
 
+    /*Finding No. of Days in Month*/
     public int getNumberOfDaysInMonth(int month) {
         return daysOfMonth[month];
     }
 
+    /*Updating the Progress Bars
+    * On the basis of drugs taken or not
+    * Also on the basis of status of each day modified later in the calendar
+    * */
     public void updateProgressBar(String choice, int date) {
         DatabaseSQLiteHelper sqLH = new DatabaseSQLiteHelper(getActivity());
-<<<<<<< HEAD
         Typeface cf = Typeface.createFromAsset(getActivity().getAssets(),"fonts/garreg.ttf");
         firstMonthProgressLabel.setText(getMonth(date - 3));
         firstMonthProgressLabel.setTypeface(cf);
-=======
-        firstMonthProgressLabel.setText(getMonth(date - 3));
->>>>>>> ankita-gsoc-gradlebuild
         int progress = sqLH.getData(mdate, myear, choice);
         float progressp = 0;
         if (choice.equalsIgnoreCase("daily"))
             progressp = (float) progress / getNumberOfDaysInMonth(mdate) * 100;
         else
             progressp = progress * 25;
-<<<<<<< HEAD
 
         if(progressp>=50)
         {
@@ -232,18 +225,11 @@ public void updateProgressBar(String choice, int date) {
 
         secondMonthProgressLabel.setText(getMonth(date - 2));
         secondMonthProgressLabel.setTypeface(cf);
-=======
-        firstMonthProgressBar.setProgress((int) progressp);
-        firstMonthProgressPercent.setText("" + (int) progressp + "%");
-
-        secondMonthProgressLabel.setText(getMonth(date - 2));
->>>>>>> ankita-gsoc-gradlebuild
         progress = sqLH.getData(mdate, myear, choice);
         if (choice.equalsIgnoreCase("daily"))
             progressp = (float) progress / getNumberOfDaysInMonth(mdate) * 100;
         else
             progressp = progress * 25;
-<<<<<<< HEAD
 
         if(progressp>=50)
         {
@@ -257,18 +243,11 @@ public void updateProgressBar(String choice, int date) {
 
         thirdMonthProgressLabel.setText(getMonth(date - 1));
         thirdMonthProgressLabel.setTypeface(cf);
-=======
-        secondMonthProgressBar.setProgress((int) progressp);
-        secondMonthProgressPercent.setText("" + (int) progressp + "%");
-
-        thirdMonthProgressLabel.setText(getMonth(date - 1));
->>>>>>> ankita-gsoc-gradlebuild
         progress = sqLH.getData(mdate, myear, choice);
         if (choice.equalsIgnoreCase("daily"))
             progressp = (float) progress / getNumberOfDaysInMonth(mdate) * 100;
         else
             progressp = progress * 25;
-<<<<<<< HEAD
 
         if(progressp>=50) {
             thirdMonthProgressBar.setBackground(getResources().getDrawable(R.drawable.progress_bg_green));
@@ -280,12 +259,6 @@ public void updateProgressBar(String choice, int date) {
 
         fourthMonthProgressLabel.setText(getMonth(date));
         fourthMonthProgressLabel.setTypeface(cf);
-=======
-        thirdMonthProgressBar.setProgress((int) progressp);
-        thirdMonthProgressPercent.setText("" + (int) progressp + "%");
-
-        fourthMonthProgressLabel.setText(getMonth(date));
->>>>>>> ankita-gsoc-gradlebuild
         progress = sqLH.getData(mdate, myear, choice);
         Log.d(TAGSAF, "Query Return: " + progress);
         if (choice.equalsIgnoreCase("daily"))
@@ -295,7 +268,6 @@ public void updateProgressBar(String choice, int date) {
         Log.d(TAGSAF, "" + getNumberOfDaysInMonth(mdate));
         Log.d(TAGSAF, "" + progress);
         Log.d(TAGSAF, "" + progressp);
-<<<<<<< HEAD
 
         if(progressp>=50) {
             fourthMonthProgressBar.setBackground(getResources().getDrawable(R.drawable.progress_bg_green));
@@ -304,12 +276,9 @@ public void updateProgressBar(String choice, int date) {
         fourthMonthProgressBar.setProgress((int) progressp);
         fourthMonthProgressPercent.setText("" + (int) progressp + "%");
         fourthMonthProgressPercent.setTypeface(cf);
-=======
-        fourthMonthProgressBar.setProgress((int) progressp);
-        fourthMonthProgressPercent.setText("" + (int) progressp + "%");
->>>>>>> ankita-gsoc-gradlebuild
     }
 
+    /**Update UI is called on resume to Update the Graph and Progress Bars**/
     public void updateUI(String choice, int date) {
 
         updateProgressBar(choice, date);
@@ -322,43 +291,13 @@ public void updateUI(String choice, int date) {
         addButtonListeners();
 
     }
-
+    /**Setting Up Graph**/
     public void SetupAndShowGraph() {
-<<<<<<< HEAD
-
-
-        /*GraphView graph = (GraphView) rootView.findViewById(R.id.graphView);
-        LineGraphSeries<DataPoint> series = new LineGraphSeries<DataPoint>(new DataPoint[] {
-                new DataPoint(0, 1),
-                new DataPoint(1, 5),
-                new DataPoint(2, 3),
-                new DataPoint(3, 2),
-                new DataPoint(4, 6)
-        });
-        graph.addSeries(series);
-
-        LineGraphSeries<DataPoint> series2 = new LineGraphSeries<DataPoint>(new DataPoint[] {
-                new DataPoint(0, 3),
-                new DataPoint(1, 3),
-                new DataPoint(2, 6),
-                new DataPoint(3, 2),
-                new DataPoint(4, 5)
-        });
-        graph.addSeries(series2);
-
-        // legend
-        series.setTitle("foo");
-        series2.setTitle("bar");
-        graph.getLegendRenderer().setVisible(true);
-        graph.getLegendRenderer().setAlign(LegendRenderer.LegendAlign.BOTTOM);*/
 
 
         GraphViewData graphViewData[] = new GraphViewData[DatabaseSQLiteHelper.date.size()];
         String verLabels[]={"100%","50%","25%","0%"};
-=======
-        GraphViewData graphViewData[] = new GraphViewData[DatabaseSQLiteHelper.date.size()];
->>>>>>> ankita-gsoc-gradlebuild
-
+        //adding data
         for (int index = 0; index < DatabaseSQLiteHelper.percentage.size(); index++) {
 
             graphViewData[index] = new GraphViewData(DatabaseSQLiteHelper.date.get(index), Double.parseDouble("" + DatabaseSQLiteHelper.percentage.get(index)));
@@ -366,7 +305,7 @@ public void SetupAndShowGraph() {
         drugGraphSeries = new GraphViewSeries(graphViewData);
 
         GraphView lineGraphView = new LineGraphView(getActivity(), "");
-
+         //styling graph
         lineGraphView.getGraphViewStyle().setGridColor(getResources().getColor(R.color.lightest_brown));
         lineGraphView.getGraphViewStyle().setGridStyle(GraphViewStyle.GridStyle.BOTH);
         lineGraphView.getGraphViewStyle().setHorizontalLabelsColor(getResources().getColor(R.color.golden_brown));
@@ -378,9 +317,6 @@ public void SetupAndShowGraph() {
         lineGraphView.setTitle("Adherence Rate vs Day");
 
 
-
-        //lineGraphView.getBac
-
         lineGraphView.setScrollable(true);
         lineGraphView.setScalable(true);
 
@@ -398,22 +334,18 @@ public String formatLabel(double value, boolean isXAxis) {
         ((LineGraphView) lineGraphView).setBackgroundColor(getResources().getColor(R.color.light_blue));
          float r=(float)0.20;
          ((LineGraphView) lineGraphView).setDataPointsRadius(r);
-
+        //plotting data
         lineGraphView.addSeries(drugGraphSeries);
-
+        //showing graph
         LinearLayout linearLayout = (LinearLayout) rootView.findViewById(R.id.graphView);
         linearLayout.addView(lineGraphView);
 
 
     }
-
+    /**Reset Dailog**/
     public void addDialog()
-    {
-<<<<<<< HEAD
+    {    //opening the reset Dialog
         dialog = new Dialog(this.getActivity(),android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
-=======
-        dialog = new Dialog(this.getActivity());
->>>>>>> ankita-gsoc-gradlebuild
         dialog.setContentView(R.layout.resetdata_dialog);
         dialog.setTitle("Reset Data");
 
diff --git a/src/com/peacecorps/malaria/SharedPreferenceStore.java b/src/com/peacecorps/malaria/SharedPreferenceStore.java
index 1946a3dc..a94a8a91 100755
--- a/src/com/peacecorps/malaria/SharedPreferenceStore.java
+++ b/src/com/peacecorps/malaria/SharedPreferenceStore.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+/**Class for Getting the Shared Preferences**/
 public class SharedPreferenceStore {
     public static SharedPreferences mPrefsStore;
     public static SharedPreferences.Editor mEditor;
diff --git a/src/com/peacecorps/malaria/SideEffectsNPCVFragmentActivity.java b/src/com/peacecorps/malaria/SideEffectsNPCVFragmentActivity.java
index cba79ea8..8aa7a782 100644
--- a/src/com/peacecorps/malaria/SideEffectsNPCVFragmentActivity.java
+++ b/src/com/peacecorps/malaria/SideEffectsNPCVFragmentActivity.java
@@ -1,10 +1,7 @@
 package com.peacecorps.malaria;
 
 import android.app.ProgressDialog;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
@@ -33,11 +30,7 @@
  */
 public class SideEffectsNPCVFragmentActivity extends FragmentActivity {
 
-<<<<<<< HEAD
     private TextView mSideEffectsNPCVLabel,sen;
-=======
-    private TextView mSideEffectsNPCVLabel;
->>>>>>> ankita-gsoc-gradlebuild
 
     private static String TAGSEN = SideEffectsNPCVFragmentActivity.class.getSimpleName();
 
@@ -53,34 +46,27 @@ public class SideEffectsNPCVFragmentActivity extends FragmentActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        //views
         setContentView(R.layout.side_effects_npcv_fragment);
 
         mSideEffectsNPCVLabel = (TextView) findViewById(R.id.sideEffectsNPCVLabel);
-<<<<<<< HEAD
         sen = (TextView) findViewById(R.id.sen);
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
         progressDialog = new ProgressDialog(this);
         progressDialog.setMessage("Please wait...");
         progressDialog.setCancelable(false);
 
-//mking json object Request
+       //mking authenticated json object Request
         Log.i(TAGSEN, "INSIDE SIDE EFFECTS NPCV");
         makeJsonObjectRequest();
-
-<<<<<<< HEAD
+        //setting fonts
         mSideEffectsNPCVLabel.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
         sen.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
-=======
->>>>>>> ankita-gsoc-gradlebuild
     }
     private void makeJsonObjectRequest(){
         Log.i(TAGSEN, "INSIDE JSON OBJECT REQUEST");
         showpDialog(); //progress dialog shows loading...while the data is being fetched
 
-        //making a JSON Object  Request below
+        //making an authenticated JSON Object  Request below
         AuthJSONObjectRequest jsonObjReq = new AuthJSONObjectRequest(Request.Method.GET, urlJsonObj, null
                 , new Response.Listener<JSONObject>() {
             @Override
@@ -99,6 +85,7 @@ public void onResponse(JSONObject response) {
 
 
                     mSideEffectsNPCVLabel.setText(jsonResponse);
+                    //reading from cache if no connectivity
 
                     String content = mSideEffectsNPCVLabel.getText().toString();
                     File file;
@@ -126,7 +113,7 @@ public void onResponse(JSONObject response) {
             public void onErrorResponse(VolleyError error) {
                 VolleyLog.d(TAGSEN, "Error: " + error.getMessage());
                 Toast.makeText(getApplicationContext(), "Error Retreiving Data! Loading from cache... ", Toast.LENGTH_LONG).show();
-
+                //offline cache
                 BufferedReader input = null;
                 File file = null;
                 try {
diff --git a/src/com/peacecorps/malaria/SideEffectsPCVFragmentActivity.java b/src/com/peacecorps/malaria/SideEffectsPCVFragmentActivity.java
index be51d4b4..9a177fbf 100644
--- a/src/com/peacecorps/malaria/SideEffectsPCVFragmentActivity.java
+++ b/src/com/peacecorps/malaria/SideEffectsPCVFragmentActivity.java
@@ -1,10 +1,7 @@
 package com.peacecorps.malaria;
 
 import android.app.ProgressDialog;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
@@ -32,12 +29,8 @@
  * Created by Ankita on 6/8/2015.
  */
 public class SideEffectsPCVFragmentActivity extends FragmentActivity {
-
-<<<<<<< HEAD
+    //views
     private TextView mSideEffectsPCVLabel,sep;
-=======
-    private TextView mSideEffectsPCVLabel;
->>>>>>> ankita-gsoc-gradlebuild
 
     private static String TAGSEP = SideEffectsPCVFragmentActivity.class.getSimpleName();
 
@@ -57,24 +50,17 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.side_effects_pcv_fragment);
 
         mSideEffectsPCVLabel = (TextView) findViewById(R.id.sideEffectsPCVLabel);
-<<<<<<< HEAD
         sep = (TextView) findViewById(R.id.sep);
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
-
+        //please wait progress dialogs
         progressDialog = new ProgressDialog(this);
         progressDialog.setMessage("Please wait...");
         progressDialog.setCancelable(false);
 
-//mking json object Request
+       //mking  authenticated json object Request
         Log.i(TAGSEP, "INSIDE SIDE EFFECTS PCV");
-<<<<<<< HEAD
 
         mSideEffectsPCVLabel.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
         sep.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
-=======
->>>>>>> ankita-gsoc-gradlebuild
         makeJsonObjectRequest();
 
     }
@@ -82,7 +68,7 @@ private void makeJsonObjectRequest(){
         Log.i(TAGSEP, "INSIDE JSON OBJECT REQUEST");
         showpDialog(); //progress dialog shows loading...while the data is being fetched
 
-        //making a JSON Object  Request below
+        //making an authenticated JSON Object  Request below
         AuthJSONObjectRequest jsonObjReq = new AuthJSONObjectRequest(Request.Method.GET, urlJsonObj, null
                 , new Response.Listener<JSONObject>() {
             @Override
@@ -103,6 +89,7 @@ public void onResponse(JSONObject response) {
                     mSideEffectsPCVLabel.setText(jsonResponse);
 
                     String content = mSideEffectsPCVLabel.getText().toString();
+                    //fetching from cache, if no internet connectivity
                     File file;
                     FileOutputStream outputStream;
                     try {
@@ -127,7 +114,7 @@ public void onResponse(JSONObject response) {
             public void onErrorResponse(VolleyError error) {
                 VolleyLog.d(TAGSEP, "Error: " + error.getMessage());
                 Toast.makeText(getApplicationContext(), "Error Retreiving Data! Loading from cache... ", Toast.LENGTH_LONG).show();
-
+                //offline cache
                 BufferedReader input = null;
                 File file = null;
                 try {
diff --git a/src/com/peacecorps/malaria/ThirdAnalyticFragment.java b/src/com/peacecorps/malaria/ThirdAnalyticFragment.java
index f2916b7e..9ee3ec81 100644
--- a/src/com/peacecorps/malaria/ThirdAnalyticFragment.java
+++ b/src/com/peacecorps/malaria/ThirdAnalyticFragment.java
@@ -82,17 +82,12 @@ public void onCreate(Bundle savedInstanceState) {
         cal_head.set(Calendar.MONTH,intmon);
 
 
-       /** In above snippet, Calendar is set by Ankita for Specific Month, not just the current month **/
+       /** In above snippet, Calendar is set for Specific Month, not just the current month **/
 
         Log.d(tag, "Calendar Instance:= " + "Month: " + month + " " + "Year: "
                 + year);
 
 
-
-        /*selectedDayMonthYearButton = (Button) this
-                .findViewById(R.id.selectedDayMonthYear);
-        selectedDayMonthYearButton.setText("Selected: ");*/
-
         prevMonth = (ImageView) this.findViewById(R.id.prevMonth);
         prevMonth.setOnClickListener(this);
 
@@ -118,6 +113,7 @@ public void onCreate(Bundle savedInstanceState) {
      * @param year
      */
 
+    /**Setting Adapter to each Grid Cell of Calendar**/
     private void setGridCellAdapterToDate(int month, int year) {
         adapter = new GridCellAdapter(getApplicationContext(),
                 R.id.calendar_day_gridcell, month, year);
@@ -345,7 +341,7 @@ else if (mm == 3)
         }
 
         /**
-         * NOTE: YOU NEED TO IMPLEMENT THIS PART Given the YEAR, MONTH, retrieve
+         *  Given the YEAR, MONTH, retrieve
          * ALL entries from a SQLite database for that month. Iterate over the
          * List of All entries, and get the dateCreated, which is converted into
          * day.
@@ -366,6 +362,14 @@ public long getItemId(int position) {
             return position;
         }
 
+        /**Setting Up the View
+         * View is Set up accoeding to the SQLite Database Entries
+         *
+         * @param position
+         * @param convertView
+         * @param parent
+         * @return
+         */
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             View row = convertView;
@@ -404,6 +408,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             int status;
             status=dbSQLH.isEntered(Integer.parseInt(theday),getMonthNumber(themonth),Integer.parseInt(theyear));
             Drawable dr;
+            //Setting the Drawables according to Taken or Not Taken
             switch (status)
             {
                 case 0:
@@ -475,6 +480,9 @@ public int getCurrentWeekDay() {
             return currentWeekDay;
         }
 
+        /*
+         Getting the number of Month from the Progress Bars in Second Analaytic Fragment
+         */
         public int getMonthNumber(String month)
         {
             SimpleDateFormat sdf=  new SimpleDateFormat("MMMM");
diff --git a/src/com/peacecorps/malaria/TripAlarmActivity.java b/src/com/peacecorps/malaria/TripAlarmActivity.java
index 2b75ae37..fc6f9d13 100644
--- a/src/com/peacecorps/malaria/TripAlarmActivity.java
+++ b/src/com/peacecorps/malaria/TripAlarmActivity.java
@@ -28,15 +28,13 @@ public class TripAlarmActivity extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        //views
         setContentView(R.layout.trip_alarm_layout);
-
-
         TextView textView = (TextView)findViewById(R.id.tripRemindingItems);
-
-
         Button btnOK = (Button)findViewById(R.id.reminderOK);
         Button btnCancel = (Button)findViewById(R.id.reminderCancel);
+
+        //intent to get the Alarm ID
         Intent intent=this.getIntent();
         final int id=intent.getIntExtra("AlarmID",0);
 
@@ -44,6 +42,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         String msg= "Your Luggage should contain following items:-";
 
+        //setting fonts
         textView.setText(msg);
         Typeface tf = Typeface.createFromAsset(getAssets(),"fonts/garreg.ttf");
         textView.setTypeface(tf);
@@ -52,7 +51,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         Cursor cursor= sqlite.getPackingItemChecked();
 
-        /** Columns to be Shown in The List **/
+        /** Columns to be Shown in The ListView **/
         String[] columns = {sqlite.KEY_ROW_ID,sqlite.PACKING_ITEM};
 
         /**XML Bound Views according to the Column**/
@@ -60,8 +59,8 @@ public void onCreate(Bundle savedInstanceState) {
                 R.id.reminderListItemNumber,R.id.reminderListItem
         };
 
-        /** Create the adapter using the cursor pointing to the desired data
-        as well as the layout information**/
+        /** Create the adapter using the cursor pointing to the desired row in query
+         * made to database ,as well as the layout information**/
         dataAdapter = new SimpleCursorAdapter(
                 this, R.layout.trip_reminder_list_item,
                 cursor,
@@ -104,7 +103,7 @@ public void onClick(View v) {
 
             }
         });
-
+        /**Cancel Listener**/
         btnCancel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/src/com/peacecorps/malaria/TripAlarmReceiver.java b/src/com/peacecorps/malaria/TripAlarmReceiver.java
index cbc7d875..5155acb3 100644
--- a/src/com/peacecorps/malaria/TripAlarmReceiver.java
+++ b/src/com/peacecorps/malaria/TripAlarmReceiver.java
@@ -14,6 +14,11 @@
 import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 
+/**
+ * On receiving the calarm call from Alarm Service,
+ * it sets the parameter for ring alarm
+ */
+
 public class TripAlarmReceiver extends WakefulBroadcastReceiver {
 
     @Override
diff --git a/src/com/peacecorps/malaria/TripIndicatorDialogActivity.java b/src/com/peacecorps/malaria/TripIndicatorDialogActivity.java
index 7e27016a..dff11137 100644
--- a/src/com/peacecorps/malaria/TripIndicatorDialogActivity.java
+++ b/src/com/peacecorps/malaria/TripIndicatorDialogActivity.java
@@ -17,6 +17,9 @@
 
 import java.util.ArrayList;
 
+/**
+ * This Dialog is the Location History Dialog
+ */
 public class TripIndicatorDialogActivity extends ListActivity {
 
     private DatabaseSQLiteHelper sqlite;
@@ -36,26 +39,25 @@ public class TripIndicatorDialogActivity extends ListActivity {
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        //getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.trip_location_dialog);
 
         mSharedPreferenceStore = new SharedPreferenceStore();
         mSharedPreferenceStore.getSharedPreferences(this);
 
         sqlite = new DatabaseSQLiteHelper(this);
-
+         //fetching location for location history
         Cursor cursor= sqlite.getLocation();
 
-        // The desired columns to be bound
+        /** Columns to be Shown in The ListView **/
         String[] columns = {sqlite.KEY_ROW_ID,sqlite.LOCATION};
 
-        // the XML defined views which the data will be bound to
+        /**XML Bound Views according to the Column**/
         int[] to = new int[] {
                 R.id.locationListItemNumber,R.id.locationListItem
         };
 
-        // create the adapter using the cursor pointing to the desired data
-        //as well as the layout information
+        /** Create the adapter using the cursor pointing to the desired row in query
+         * made to database ,as well as the layout information**/
         dataAdapter = new SimpleCursorAdapter(
                 this, R.layout.trip_location_list_item,
                 cursor,
diff --git a/src/com/peacecorps/malaria/TripIndicatorFragmentActivity.java b/src/com/peacecorps/malaria/TripIndicatorFragmentActivity.java
index 86ec2f53..61612c8a 100644
--- a/src/com/peacecorps/malaria/TripIndicatorFragmentActivity.java
+++ b/src/com/peacecorps/malaria/TripIndicatorFragmentActivity.java
@@ -1,7 +1,6 @@
 package com.peacecorps.malaria;
 
 import android.app.Activity;
-<<<<<<< HEAD
 import android.app.AlarmManager;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
@@ -41,46 +40,16 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-=======
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.view.View.OnClickListener;
-import android.view.View.OnTouchListener;
-
-import com.peacecorps.malaria.R;
-
-import java.util.ArrayList;
->>>>>>> ankita-gsoc-gradlebuild
 
 /**
  * Created by Ankita on 7/3/2015.
  */
-<<<<<<< HEAD
-public class TripIndicatorFragmentActivity extends FragmentActivity {
 
+/**
+ * Activity fro Plan My Trip Main Screen
+ */
+public class TripIndicatorFragmentActivity extends FragmentActivity {
+    //declaring views
     public boolean sent;
     private Button btnInfoHub, btnHome,btnGenerate,btnGear;
     private String mDrugPicked,mLocationPicked;
@@ -119,30 +88,14 @@ public void onStart() {
         super.onStart();
         inst = this;
     }
-=======
-public class TripIndicatorFragmentActivity extends Activity {
-
-    private Button btnInfoHub, btnHome,btnGenerate,btnGear;
-    private Spinner drugSpinner,locationSpinner,itemSpinner;
-    private String mDrugPicked,mLocationPicked,mItemPicked;
-    private EditText cashData,dateData,monthData,yearData;
-    public static boolean[] checkSelected;
-    private ArrayList<String> items;
-    private PopupWindow pw;
-    private boolean expanded;
-    static SharedPreferenceStore mSharedPreferenceStore;
-    private Dialog dialog = null;
-
-
->>>>>>> ankita-gsoc-gradlebuild
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //Setting Up Views
         setContentView(R.layout.tripindicator_layout);
         btnInfoHub=(Button)findViewById(R.id.infoButton);
         btnHome=(Button)findViewById(R.id.homeButton);
-<<<<<<< HEAD
         locationSpinner=(EditText)findViewById(R.id.trip_location_select_editText);
         btnGenerate=(Button)findViewById(R.id.generateButton);
         btnGear=(Button)findViewById(R.id.trip_settings_button);
@@ -152,6 +105,7 @@ public void onCreate(Bundle savedInstanceState) {
         tripTime = (TextView)findViewById(R.id.trip_time);
         pmtLabel = (TextView)findViewById(R.id.pmt);
 
+        //setting fonts
         Typeface cf = Typeface.createFromAsset(getAssets(),"fonts/garreg.ttf");
         pmtLabel.setTypeface(cf);
 
@@ -167,7 +121,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         mLocationPicked=intent.getStringExtra(TripIndicatorDialogActivity.LOCATION_TAG);
 
-
+        //fetching location
         try
         {
             mLocationPicked=SharedPreferenceStore.mPrefsStore.getString("com.peacecorps.malaria.TRIP_LOCATION","");
@@ -219,27 +173,11 @@ protected void onPause() {
                     "com.peacecorps.malaria.TRIP_LOCATION",mLocationPicked);
         }
 
-=======
-        drugSpinner=(Spinner)findViewById(R.id.trip_medication_select_spinner);
-        locationSpinner=(Spinner)findViewById(R.id.trip_location_select_spinner);
-        //itemSpinner=(Spinner)findViewById(R.id.trip_packing_item_select_spinner);
-        btnGenerate=(Button)findViewById(R.id.generateButton);
-        btnGear=(Button)findViewById(R.id.trip_settings_button);
-        cashData=(EditText)findViewById(R.id.trip_cash_select_editext);
-        dateData=(EditText)findViewById(R.id.trip_date);
-        monthData=(EditText)findViewById(R.id.trip_month);
-        yearData=(EditText)findViewById(R.id.trip_year);
-
-
-
-        addListeners();
-        createSelectionSpinners();
-        initialize();
-        createOnItemSelectedListeners();
->>>>>>> ankita-gsoc-gradlebuild
     }
 
-
+    /*
+    Adding Listeners of Each Button, Generate ,Packing List and Location History Too.
+     */
     public void addListeners(){
 
         btnGear.setOnClickListener(new View.OnClickListener(){
@@ -255,10 +193,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(getApplication().getApplicationContext(), MainActivity.class));
-<<<<<<< HEAD
                 finish();
-=======
->>>>>>> ankita-gsoc-gradlebuild
             }
         });
 
@@ -266,10 +201,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 startActivity(new Intent(getApplication().getApplicationContext(), InfoHubFragmentActivity.class));
-<<<<<<< HEAD
                 finish();
-=======
->>>>>>> ankita-gsoc-gradlebuild
             }
         });
 
@@ -278,7 +210,6 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
 
-<<<<<<< HEAD
                 /*Bundle b = getIntent().getExtras();
                 String[] resultArr = b.getStringArray("selectedItems");*/
 
@@ -311,7 +242,11 @@ public void onClick(View v) {
                 Log.d(TAGTIFA, "Today: " + today);
                 if(deptime>today) {
                     interval = getTimeInterval(deptime, today);
-
+                    /**
+                     * Setting Up Alarm for a Week Before
+                     * A day Before
+                     * On day of Trip
+                     */
                     long sevenDays = 6 * 24 * 60 * 60 * 1000;
                     long oneDay = 24 * 60 * 60 * 1000;
                     Log.d(TAGTIFA,"Alarm Interval: "+interval);
@@ -365,6 +300,7 @@ public void onClick(View v) {
             }
         });
 
+        //Opening the location history dialog
         loc_history.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -385,7 +321,7 @@ public void onClick(View v) {
 
         });
 
-
+        //opening the select packing dialog
         packingSelect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -401,175 +337,11 @@ public void onClick(View v) {
                 startActivity(intent);
 
                 packingSelect.setText(TripIndicatorPackingActivity.tripDrugName);
-=======
-
-                String cash=cashData.getText().toString();
-                float cash_value=Float.parseFloat(cash);
-                SharedPreferenceStore.mEditor.putFloat("com.peacecorps.malaria.trip_cash_editext",cash_value).commit();
-                Log.d("TripIndicatorActivity", "Value for cash: " + cash_value);
-                String date_data=dateData.getText().toString();
-                int date=Integer.parseInt(date_data);
-                String month_data=monthData.getText().toString();
-                int month=Integer.parseInt(month_data);
-                String year_data=yearData.getText().toString();
-                int year=Integer.parseInt(year_data);
-                String formattedate=date_data+"/"+month_data+"/"+year_data;
-                SharedPreferenceStore.mEditor.putString("com.peacecorps.malaria.trip_date", formattedate).commit();
-                String chklist="";
-                for(int i=0;i<items.size();i++)
-                {
-                    if(checkSelected[i]==true)
-                    {
-                        chklist+=items.get(i)+" ";
-                    }
-
-                }
-                SharedPreferenceStore.mEditor.putString("com.peacecorps.malaria.trip_packing_items",chklist).commit();
-                SharedPreferenceStore.mEditor.putString("com.peacecorps.malaria.trip_drug",mDrugPicked).commit();
-                SharedPreferenceStore.mEditor.putString("com.peacecorps.malaria.trip_location",mLocationPicked).commit();
-
-                mItemPicked="Trip to "+mLocationPicked+" is scheduled on "+formattedate+". Please bring "+cash+" in cash and also the following items:- \n"+chklist;
-
-                Toast.makeText(getApplicationContext(),mItemPicked,Toast.LENGTH_LONG).show();
-
-            }
-        });
-
-    }
-
-    private void createSelectionSpinners() {
-
-        ArrayAdapter<CharSequence> drugAdapter = ArrayAdapter.createFromResource(
-                this, R.array.drug_array,
-                R.layout.trip_spinner_item);
-
-        drugAdapter.setDropDownViewResource(R.layout.trip_spinner_popup_item);
-
-        drugSpinner.setAdapter(drugAdapter);
-
-        ArrayAdapter<CharSequence> locationAdapter = ArrayAdapter.createFromResource(
-                this, R.array.location_array,
-                R.layout.trip_spinner_item);
-
-        locationAdapter.setDropDownViewResource(R.layout.trip_spinner_popup_item);
-
-        locationSpinner.setAdapter(locationAdapter);
-
-        /*ArrayAdapter<CharSequence> itemAdapter = ArrayAdapter.createFromResource(
-                this, R.array.item_array,
-                R.layout.trip_spinner_item);
-
-        itemAdapter.setDropDownViewResource(R.layout.trip_spinner_popup_item);
-
-        itemSpinner.setAdapter(itemAdapter);*/
-
-
-    }
-
-    public void createOnItemSelectedListeners()
-    {
-        drugSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-            public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
-                mDrugPicked = drugSpinner.getItemAtPosition(position).toString();
-                Log.d("TripIndicatorActivity", "Chosen ->" + mDrugPicked);
-                //Toast.makeText(getApplicationContext(), mDrugPicked, Toast.LENGTH_SHORT).show();
-
-            }
-
-            public void onNothingSelected(AdapterView<?> parentView) {
-
             }
         });
 
-        locationSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-            public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
-                mLocationPicked = locationSpinner.getItemAtPosition(position).toString();
-                Log.d("TripIndicatorActivity", "Chosen ->" + mLocationPicked);
-                //Toast.makeText(getApplicationContext(), mLocationPicked, Toast.LENGTH_SHORT).show();
-
-            }
-
-            public void onNothingSelected(AdapterView<?> parentView) {
-
-            }
-        });
-
-
-        /*itemSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-            public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
-                mItemPicked = itemSpinner.getItemAtPosition(position).toString();
-                Log.d("TripIndicatorActivity", "Chosen ->" + mItemPicked);
-                Toast.makeText(getApplicationContext(), mItemPicked, Toast.LENGTH_SHORT).show();
-
-            }
-
-            public void onNothingSelected(AdapterView<?> parentView) {
-
-            }
-        });*/
-
-
-
     }
 
-    private void initialize(){
-
-        items = new ArrayList();
-        items.add("Drugs");
-        items.add("Mosquito Nets");
-        items.add("Ointments");
-
-        checkSelected = new boolean[items.size()];
-        for (int i = 0; i < checkSelected.length; i++) {
-            checkSelected[i] = false;
-        }
-        Log.d("TripIndicatorActivity", "Items Added, Check Selected Done");
-        LinearLayout layout1 = (LinearLayout)findViewById(R.id.tripItemSelector);
-        final TextView itemTV=(TextView)findViewById(R.id.tripSelectBox);
-        itemTV.setOnClickListener(new OnClickListener() {
-
-
-            @Override
-            public void onClick(View v) {
-                // TODO Auto-generated method stub
-                Log.d("TripIndicatorActivity", "Inside itemTV On Click Listener");
-                if (!expanded) {
-                    //display all selected values
-                    String selected = "";
-                    int flag = 0;
-                    for (int i = 0; i < items.size(); i++) {
-                        if (checkSelected[i] == true) {
-                            selected += items.get(i);
-                            selected += ", ";
-                            flag = 1;
-                        }
-                    }
-                    if (flag == 1)
-                        itemTV.setText(selected);
-                    expanded = true;
-                } else {
-                    //display shortened representation of selected values
-                    itemTV.setText(DropDownListAdapter.getSelected());
-                    expanded = false;
-                }
-            }
-        });
-        final Button btnItemDropdown=(Button)findViewById(R.id.tripCreate);
-        btnItemDropdown.setOnClickListener(new OnClickListener() {
-
-            public void onClick(View v) {
-                // TODO Auto-generated method stub
-                initiatePopUp(items, itemTV);
->>>>>>> ankita-gsoc-gradlebuild
-            }
-        });
-
-    }
-
-<<<<<<< HEAD
     private void createSelectionSpinners() {
 
         ArrayAdapter<CharSequence> drugAdapter = ArrayAdapter.createFromResource(
@@ -579,62 +351,13 @@ private void createSelectionSpinners() {
         drugAdapter.setDropDownViewResource(R.layout.trip_spinner_popup_item);
 
 
-=======
-    private void initiatePopUp(ArrayList<String> items, TextView tv){
-        LayoutInflater inflater = (LayoutInflater)TripIndicatorFragmentActivity.this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        //get the pop-up window i.e.  drop-down layout
-        LinearLayout layout = (LinearLayout)inflater.inflate(R.layout.trip_item_dropdown_list, (ViewGroup)findViewById(R.id.tripPackingItemPopUpView));
-
-        //get the view to which drop-down layout is to be anchored
-        LinearLayout layout1 = (LinearLayout)findViewById(R.id.tripItemSelector);
-        pw = new PopupWindow(layout, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, true);
-
-        //Pop-up window background cannot be null if we want the pop-up to listen touch events outside its window
-        pw.setBackgroundDrawable(new BitmapDrawable());
-        pw.setTouchable(true);
-
-        //let pop-up be informed about touch events outside its window. This  should be done before setting the content of pop-up
-        pw.setOutsideTouchable(true);
-        pw.setHeight(LayoutParams.WRAP_CONTENT);
-
-        //dismiss the pop-up i.e. drop-down when touched anywhere outside the pop-up
-        pw.setTouchInterceptor(new View.OnTouchListener() {
-
-            public boolean onTouch(View v, MotionEvent event) {
-                // TODO Auto-generated method stub
-                if (event.getAction() == MotionEvent.ACTION_OUTSIDE) {
-                    pw.dismiss();
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        //provide the source layout for drop-down
-        pw.setContentView(layout);
-
-        //anchor the drop-down to bottom-left corner of 'layout1'
-        pw.showAsDropDown(layout1);
-
-        //populate the drop-down list
-        final ListView list = (ListView) layout.findViewById(R.id.tripPackingItemDropDownList);
-        DropDownListAdapter adapter = new DropDownListAdapter(this, items, tv);
-        list.setAdapter(adapter);
->>>>>>> ankita-gsoc-gradlebuild
     }
-
+     //opening the reset dialog
     public void addDialog()
     {
-<<<<<<< HEAD
         dialog = new Dialog(TripIndicatorFragmentActivity.this,android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
         dialog.setContentView(R.layout.resetdata_dialog);
         //dialog.setTitle("Reset Data");
-=======
-        dialog = new Dialog(TripIndicatorFragmentActivity.this);
-        dialog.setContentView(R.layout.resetdata_dialog);
-        dialog.setTitle("Reset Data");
->>>>>>> ankita-gsoc-gradlebuild
 
         final RadioGroup btnRadGroup = (RadioGroup) dialog.findViewById(R.id.radioGroupReset);
         Button btnOK = (Button) dialog.findViewById(R.id.dialogButtonOKReset);
@@ -676,7 +399,7 @@ public void onClick(View v) {
 
     }
 
-<<<<<<< HEAD
+    //finding the no. of drugs to be taken for trip
     public void setNumDrugs(String depart,String arrive){
 
 
@@ -720,7 +443,7 @@ private Date getDateObj(String s){
 
     private void setDates()
     {
-
+        //Setting Up the Date
         String date_data=dateData.getText().toString();
         String month_data=monthData.getText().toString();
         String year_data=yearData.getText().toString();
@@ -739,6 +462,9 @@ private void setDates()
 
     }
 
+    /**Date Picker Dialog
+     * For Arrival and Departure
+     */
     public class DatePickerFragmentArrival extends DialogFragment
             implements DatePickerDialog.OnDateSetListener {
 
@@ -816,7 +542,7 @@ public void onDateSet(DatePicker view, int year, int month, int day) {
 
 
         }
-
+        /**Updating in Trip Indicator Activity**/
         public void setTextFields(int date, int month,int year)
         {
             DepartureDateData=(TextView)findViewById(R.id.trip_date_departure);
@@ -829,12 +555,12 @@ public void setTextFields(int date, int month,int year)
 
         }
     }
-
+    /*Showing the Dialogs*/
     public void showDatePickerDialogDeparture(View v) {
         DialogFragment newFragment = new DatePickerFragmentDeparture();
         newFragment.show(getFragmentManager(), "Departure Date");
     }
-
+   //get time interval
     public long getTimeInterval(long t1,long t2)
     {
         long interval;
@@ -897,7 +623,5 @@ public void showTimePickerDialogDeparture(View v)
         DialogFragment newFragment = new TimePickerDialogDeparture();
         newFragment.show(getFragmentManager(),"Departure Time");
     }
-=======
->>>>>>> ankita-gsoc-gradlebuild
 
 }
\ No newline at end of file
diff --git a/src/com/peacecorps/malaria/TripIndicatorPackingActivity.java b/src/com/peacecorps/malaria/TripIndicatorPackingActivity.java
index 9308b23a..7e8c917f 100644
--- a/src/com/peacecorps/malaria/TripIndicatorPackingActivity.java
+++ b/src/com/peacecorps/malaria/TripIndicatorPackingActivity.java
@@ -134,7 +134,9 @@ public void onClick(View v) {
 
         /** Setting the event listener for the add button **/
         btnDelete.setOnClickListener(listenerDelete);
-
+        /**Setting the Growing List
+         * And adding entries to the database
+         */
         View.OnClickListener listenerSubmit = new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -149,7 +151,7 @@ public void onClick(View v) {
                 }
 
                 outputStrArr = new String[selectedItems.size()];
-
+                //adding to database
                 for (int i = 0; i < selectedItems.size(); i++) {
                     outputStrArr[i] = selectedItems.get(i);
                     sqLite.insertPackingItem(outputStrArr[i],1,"yes");
@@ -162,11 +164,11 @@ public void onClick(View v) {
                 for(int i=0;i<outputStrArr.length;i++)
                     mSharedPreferenceStore.mEditor.putString(outputStrArr + "_" + i, outputStrArr[i]).commit();
 
-                // Create a bundle object
+                /** Create a bundle object**/
                 Bundle b = new Bundle();
                 b.putStringArray("selectedItems", outputStrArr);
 
-                // Add the bundle to the intent.
+                /**Add the bundle to the intent.**/
                 bkIntent.putExtras(b);
                 //.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 
@@ -193,7 +195,7 @@ public void onClick(View v) {
         btnSubmit.setOnClickListener(listenerSubmit);
 
 
-
+        /**Getting the Identity of Pill**/
         Intent intent = getIntent();
         mNumDrugs=intent.getLongExtra(TripIndicatorFragmentActivity.DRUG_TAG,0);
         numDrugs = (TextView)findViewById(R.id.quantity);
@@ -227,7 +229,7 @@ private void getSharedPreferences() {
 
     @Override
     protected Dialog onCreateDialog(int id) {
-
+         /**Dialog for Selecting the Drug**/
         final Dialog dialog=new Dialog(TripIndicatorPackingActivity.this,android.R.style.Theme_DeviceDefault_Dialog_NoActionBar);
         dialog.setContentView(R.layout.trip_item_dropdown_list);
         dialog.setTitle("Select Drugs");
@@ -239,6 +241,7 @@ protected Dialog onCreateDialog(int id) {
         dialog_listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                //setting the text to the drug selected
                 whichDrug.setText(parent.getItemAtPosition(position).toString());
                 tripDrugName=parent.getItemAtPosition(position).toString();
                 TripIndicatorFragmentActivity.packingSelect.setText(mNumDrugs + " " + tripDrugName + " etc.");
diff --git a/src/com/peacecorps/malaria/UserMedicineSettingsFragmentActivity.java b/src/com/peacecorps/malaria/UserMedicineSettingsFragmentActivity.java
index 1d9f972b..989baca9 100755
--- a/src/com/peacecorps/malaria/UserMedicineSettingsFragmentActivity.java
+++ b/src/com/peacecorps/malaria/UserMedicineSettingsFragmentActivity.java
@@ -10,19 +10,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.database.DatabaseErrorHandler;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.text.format.DateFormat;
 import android.util.Log;
-<<<<<<< HEAD
 import android.view.LayoutInflater;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.view.View;
 
 import java.util.Calendar;
@@ -56,7 +50,6 @@ public class UserMedicineSettingsFragmentActivity extends FragmentActivity
     private static View v;
     private static TimePicker tp;
 
-
     public static Context mFragmentContext;
 
     /*User Medicine Settings Fragment Activity is for the Setup Screen of the Malaria App*/
diff --git a/src/com/peacecorps/malaria/VolleyApplication.java b/src/com/peacecorps/malaria/VolleyApplication.java
index 50705920..fec8fab0 100644
--- a/src/com/peacecorps/malaria/VolleyApplication.java
+++ b/src/com/peacecorps/malaria/VolleyApplication.java
@@ -10,6 +10,13 @@
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 
+/**
+ * Volley Application
+ *
+ * Class for using volley library for making JSON Object Requests
+ * Volley is a light weight library
+ * Will be useful in future, if images and graphs also have to be plotted
+ */
 public class VolleyApplication extends Application {
 
     public static final String TAG = VolleyApplication.class.getSimpleName();
diff --git a/src/com/peacecorps/malaria/VolunteerAdherenceFragmentActivity.java b/src/com/peacecorps/malaria/VolunteerAdherenceFragmentActivity.java
index 264f8c05..18962320 100644
--- a/src/com/peacecorps/malaria/VolunteerAdherenceFragmentActivity.java
+++ b/src/com/peacecorps/malaria/VolunteerAdherenceFragmentActivity.java
@@ -1,10 +1,7 @@
 package com.peacecorps.malaria;
 
 import android.app.ProgressDialog;
-<<<<<<< HEAD
 import android.graphics.Typeface;
-=======
->>>>>>> ankita-gsoc-gradlebuild
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
@@ -33,11 +30,7 @@
  */
 public class VolunteerAdherenceFragmentActivity extends FragmentActivity {
 
-<<<<<<< HEAD
     private TextView mVolunteerAdherenceLabel,vaf;
-=======
-    private TextView mVolunteerAdherenceLabel;
->>>>>>> ankita-gsoc-gradlebuild
 
     private static String TAGVA = VolunteerAdherenceFragmentActivity.class.getSimpleName();
 
@@ -53,28 +46,21 @@ public class VolunteerAdherenceFragmentActivity extends FragmentActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+     //views
         setContentView(R.layout.volunteer_adherence_fragment);
 
         mVolunteerAdherenceLabel = (TextView) findViewById(R.id.volunteerAdherenceLabel);
-<<<<<<< HEAD
         vaf=  (TextView) findViewById(R.id.var);
-=======
-
->>>>>>> ankita-gsoc-gradlebuild
         progressDialog = new ProgressDialog(this);
         progressDialog.setMessage("Please wait...");
         progressDialog.setCancelable(false);
 
-//mking json object Request
+//mking authenticated json object Request
         Log.i(TAGVA, "INSIDE VOLUNTEER ADHERENCE");
-<<<<<<< HEAD
 
         mVolunteerAdherenceLabel.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
         vaf.setTypeface(Typeface.createFromAsset(getAssets(), "fonts/garreg.ttf"));
 
-=======
->>>>>>> ankita-gsoc-gradlebuild
         makeJsonObjectRequest();
 
     }
@@ -83,7 +69,7 @@ private void makeJsonObjectRequest(){
         Log.i(TAGVA, "INSIDE JSON OBJECT REQUEST");
         showpDialog(); //progress dialog shows loading...while the data is being fetched
 
-        //making a JSON Object  Request below
+        //making an authenticated JSON Object  Request below
         AuthJSONObjectRequest jsonObjReq = new AuthJSONObjectRequest(Request.Method.GET, urlJsonObj, null
                 , new Response.Listener<JSONObject>() {
             @Override
@@ -102,7 +88,7 @@ public void onResponse(JSONObject response) {
 
 
                     mVolunteerAdherenceLabel.setText(jsonResponse);
-
+                    //reading from cache, if no connectivity
                     String content = mVolunteerAdherenceLabel.getText().toString();
                     File file;
                     FileOutputStream outputStream;
@@ -128,7 +114,7 @@ public void onResponse(JSONObject response) {
             public void onErrorResponse(VolleyError error) {
                 VolleyLog.d(TAGVA, "Error: " + error.getMessage());
                 Toast.makeText(getApplicationContext(), "Error Retreiving Data! Loading from cache... ", Toast.LENGTH_LONG).show();
-
+                //offline cache
                 BufferedReader input = null;
                 File file = null;
                 try {