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

Conflicts:
	Breaker/bin/classes/com/EC327/breaker/MainActivity$FlingRunnable.class
	Breaker/bin/classes/com/EC327/breaker/MainActivity$MyGestureDetector.class
	Breaker/bin/classes/com/EC327/breaker/MainActivity$MyOnTouchListener.class
	Breaker/bin/classes/com/EC327/breaker/MainActivity.class
Merge branch 'master' of https://github.com/abesary/EC327-Project

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