-text view added to TimerActivity
Merge branch 'master' of git@github.com:abesary/EC327-Project.git

Conflicts:
	Breaker/bin/Breaker.apk
	Breaker/bin/resources.ap_