kasfd
Merge branch 'master' of git@github.com:abesary/EC327-Project.git

Conflicts:
	Breaker/bin/Breaker.apk
Merge branch 'master' of git@github.com:abesary/EC327-Project.git

Conflicts:
	Breaker/bin/Breaker.apk
	Breaker/bin/classes.dex
	Breaker/bin/classes/com/EC327/breaker/TimerActivity$1.class