working on button functionality
Merge branch 'master' of https://github.com/napon/VibrateTimer
can now check for oldTimer stuff
Merge branch 'master' of https://github.com/napon/VibrateTimer

Conflicts:
	src/com/napontaratan/vibratetimer/SetTimerActivity.java
linked buttons with INTENT