test
Merge branch 'master' of https://github.com/ashi-psn/Alarm

Conflicts:
	src/com/example/alarm/MainActivity.java