Merge branch 'Geoffs_WIP'
Fixes
Game class to hold the main method.

gimme tha terminal codes assaHOLE
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project

Conflicts:
	Text Adventure/bin/.gitignore
added initial comments
Merge branch 'Geoffs_WIP'
Merge branch 'master' into Geoffs_WIP