meh
Merge branch 'sorry' of https://github.com/southkid23/Adventure-Game into sorry

Conflicts:
	Game.cpp
Merge branch 'sorry' of https://github.com/southkid23/Adventure-Game into sorry

Conflicts:
	Game.cpp