Added line for user to return to main menu from game map by pressing escape
Test scene with changes/references to main menu scene and scripts
Merge branch 'master' of https://github.com/Honeybunch/WaifuQuest

Conflicts:
	Assets/test.unity