stupid android
hahaha
Merge remote-tracking branch 'origin/master'

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