alaram setting
alaram
Merge branch 'master' of https://github.com/Youhana-Hana/PrescriptionWatcher

Conflicts:
	src/AndroidManifest.xml