some cleanup
Update testpull.txt
test
Merge branch 'sprint1' of https://github.com/jmccranie/Blast.git into
sprint1

Conflicts:
	Blast/testpull.txt
Added basic reflect firing with an explosion png. Fixed up some pngs.
onPause, resume, and destroy stuff
Added collision detection when moving tanks around. Moves the tank to
its original position if there is a collision.

Signed-off-by: Jeff McCranie <jmccranie@gmail.com>
Merge branch 'sprint1' of https://github.com/jmccranie/Blast into sprint1

Conflicts:
	Blast/assets/gfx/barricade.png
	Blast/assets/gfx/explosion.png
	Blast/assets/gfx/tank.png
	Blast/src/com/cen3031/blast/UnitAllocationActivity.java
Fixed Tanks placement on Allocation
test
Merge branch 'sprint2' of https://github.com/jmccranie/Blast.git into sprint2

Conflicts:
	Blast/src/com/cen3031/blast/UnitAllocationActivity.java
Removed andengine jar