Made full game
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