mapwork
merged

Conflicts:
	bin/OmniGlucoseTracker.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/ece641/March11th/graph/GraphViewHelper$1.class
	bin/classes/ece641/March11th/graph/GraphViewHelper$2.class
	bin/classes/ece641/March11th/graph/GraphViewHelper$3.class
	bin/classes/ece641/March11th/test/TestActivity.class
	bin/classes/ece641/March11th/ui/DailyFragment.class
	bin/classes/ece641/March11th/ui/LocationFragment.class
	bin/classes/ece641/March11th/ui/MonthlyFragment.class
	bin/classes/ece641/March11th/ui/NavigationFragment$1.class
	bin/classes/ece641/March11th/ui/NavigationFragment$2.class
	bin/classes/ece641/March11th/ui/NavigationFragment$3.class
	bin/classes/ece641/March11th/ui/NavigationFragment$4.class
	bin/classes/ece641/March11th/ui/NavigationFragment$5.class
	bin/classes/ece641/March11th/ui/NavigationFragment$6.class
	bin/classes/ece641/March11th/ui/NavigationFragment$7.class
	bin/classes/ece641/March11th/ui/NavigationFragment$8.class
	bin/classes/ece641/March11th/ui/NavigationFragment$9.class
	bin/classes/ece641/March11th/ui/NavigationFragment.class
	bin/classes/ece641/March11th/ui/R$id.class
	bin/classes/ece641/March11th/ui/R$integer.class
	bin/classes/ece641/March11th/ui/R$layout.class
	bin/classes/ece641/March11th/ui/R$menu.class
	bin/classes/ece641/March11th/ui/R$string.class
	bin/classes/ece641/March11th/ui/R$style.class
	bin/classes/ece641/March11th/ui/R$styleable.class
	bin/classes/ece641/March11th/ui/UserInfoFragment.class
	bin/classes/ece641/March11th/ui/WeeklyFragment.class
	bin/classes/ece641/March11th/ui/WelcomeActivity.class
	bin/resources.ap_
	gen/ece641/March11th/ui/R.java
	src/ece641/March11th/ui/NavigationFragment.java
merged