init
add button3, button4
add button3, button4
Merge branch 'master' of github.com:q5678909/setalarm

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