majs
	modified:   SuitEmUp_Basev2/thelastbox.v11.suo
	modified:   SuitEmUp_Basev2/thelastbox/Gamestate.cpp
	modified:   SuitEmUp_Basev2/thelastbox/Gamestate.hpp
	modified:   SuitEmUp_Basev2/thelastbox/Level_Wall.cpp
	modified:   SuitEmUp_Basev2/thelastbox/PlayerObject.cpp
Merge branch 'master' of https://github.com/GroupEight/SuitEmUp_

Conflicts:
	SuitEmUp_Basev2/thelastbox.v11.suo
	SuitEmUp_Basev2/thelastbox/Level_Wall.cpp