done the maps
done the maps
Merge branch 'gameover/map'

Conflicts:
	SP1Framework/gameStage.cpp
	SP1Framework/gameStage.h
	SP1Framework/main.cpp

Bugs from merging fixed.