First commit
Merge branch 'Robin'

Conflicts:
	Escape_V2/Escape_V2/Engine.cpp
	Escape_V2/Escape_V2/StartMenuState.cpp
	Escape_V2/Escape_V2/StateManager.cpp
conflicts
Merge branch 'master' of https://github.com/Robinde67/Boring-Warrior_Escape

Conflicts:
	Escape_V2/Escape_V2/Engine.cpp
	Escape_V2/Escape_V2/StartMenuState.cpp
	Escape_V2/Escape_V2/StateManager.cpp