New rooms & polish
Merge branch 'master' of https://github.com/Enfisk/suit-em-up

Conflicts:
	SuitEmUp/SuitEmUp/EnemyManager.cpp
	SuitEmUp/SuitEmUp/PlayState.cpp
	SuitEmUp/SuitEmUp/PlayState.h
	SuitEmUp/SuitEmUp/PlayerObject.h