timer implementing
merged
Merge branch 'master' of https://github.com/abesary/EC327-Project.git

Conflicts:
	Breaker/bin/Breaker.apk
	Breaker/bin/classes.dex
	Breaker/bin/classes/com/EC327/breaker/R$layout.class
	Breaker/bin/classes/com/EC327/breaker/R$menu.class
	Breaker/bin/classes/com/EC327/breaker/R$string.class
	Breaker/bin/classes/com/EC327/breaker/R$style.class
	Breaker/bin/classes/com/EC327/breaker/TimerActivity$1.class
	Breaker/bin/classes/com/EC327/breaker/TimerActivity.class
	Breaker/bin/resources.ap_