New Weight Tracker Files
Weight Tracker Implementation
Generalized Weight Tracker components
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/PHR-Android.apk
	bin/classes.dex
	bin/classes/com/example/phr/model/BloodPressure.class
	bin/classes/com/example/phr/model/BloodSugar.class
	bin/resources.ap_
	gen/com/example/phr/R.java