Lam- changes to alarm
Merge branch 'master' of https://github.com/seth-skocelas/PHMS

Conflicts:
	PHMS/bin/PHMS.apk
	PHMS/bin/classes.dex
	PHMS/bin/classes/com/example/phms/AddAlertActivity.class
	PHMS/bin/classes/com/example/phms/AddMedicationActivity.class
	PHMS/bin/classes/com/example/phms/AlertActivity.class
	PHMS/bin/classes/com/example/phms/DietActivity$1$1.class
	PHMS/bin/classes/com/example/phms/DietActivity.class
	PHMS/bin/classes/com/example/phms/EditAccountActivity.class
	PHMS/bin/classes/com/example/phms/ExerciseEditorActivity$1$1$1.class
	PHMS/bin/classes/com/example/phms/ExerciseEditorActivity$1.class
	PHMS/bin/classes/com/example/phms/ExerciseEditorActivity.class
	PHMS/bin/classes/com/example/phms/FoodEditorActivity$1$1$1.class
	PHMS/bin/classes/com/example/phms/FoodEditorActivity$1.class
	PHMS/bin/classes/com/example/phms/FoodEditorActivity.class
	PHMS/bin/classes/com/example/phms/MainMenuActivity.class
	PHMS/bin/classes/com/example/phms/MedicationActivity.class
	PHMS/bin/classes/com/example/phms/R$id.class
	PHMS/bin/classes/com/example/phms/R$layout.class
	PHMS/bin/classes/com/example/phms/R$menu.class
	PHMS/bin/classes/com/example/phms/R$string.class
	PHMS/bin/classes/com/example/phms/R$style.class
	PHMS/bin/classes/com/example/phms/ResultActivity.class
	PHMS/bin/classes/com/example/phms/SearchActivity.class
	PHMS/bin/classes/com/example/phms/SettingsActivity.class
	PHMS/bin/classes/com/example/phms/VitalSignsActivity$3.class
	PHMS/bin/classes/com/example/phms/VitalSignsActivity.class
	PHMS/bin/dexedLibs/android-support-v4-9ec06239b733d86ee1cfda0f40c28a93.jar
	PHMS/bin/resources.ap_
	PHMS/gen/com/example/phms/R.java