clock added
clock added
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_main.xml
	src/com/example/shakalarm/MainActivity.java