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

Conflicts:
	Breaker/bin/Breaker.apk
	Breaker/bin/classes.dex
	Breaker/src/com/EC327/breaker/MainActivity.java