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

Conflicts:
	Breaker/src/com/EC327/breaker/MainActivity.java