final copy
Merge branch 'master' of https://github.com/

Conflicts:
	bin/classes.dex
	bin/classes/com/example/phr/R$id.class
	bin/classes/com/example/phr/R$layout.class
	bin/classes/com/example/phr/R$string.class
	bin/classes/com/example/phr/R$style.class
	bin/classes/com/example/phr/view_blood_pressure_graph.class
	bin/classes/com/example/phr/view_blood_sugar.class
	bin/classes/com/example/phr/view_emergency_contact.class
	bin/classes/com/example/phr/view_height_weight.class
	bin/classes/com/example/phr/view_immunization.class
	bin/classes/com/example/phr/view_medication.class
	bin/classes/com/example/phr/view_temperature.class
	bin/resources.ap_
	gen/com/example/phr/R.java