Freakin soldiers man
Merge branch 'sprint2' of https://github.com/jmccranie/Blast.git into
sprint2

Conflicts:
	Blast/src/com/cen3031/blast/UnitAllocationActivity.java
Merge branch 'sprint2' of https://github.com/jmccranie/Blast.git into
sprint2

Conflicts:
	Blast/src/com/cen3031/blast/UnitAllocationActivity.java