Soldier class added
Merge branch 'master' of https://github.com/Crismis333/SpaceGameJam

Conflicts:
	SpaceGame/App.h