end of Sprint
Merge branch 'new_engine' of https://github.com/davidgiga1993/SOLAR into new_engine

Conflicts:
	Project/Solar/src/com/me/stages/GameHUDStage.java