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

Conflicts:
	Breaker/bin/classes/com/EC327/breaker/TimerActivity$2.class
	Breaker/bin/classes/com/EC327/breaker/TimerActivity.class
	Breaker/src/com/EC327/breaker/TimerActivity.java