?
Merge branch 'master' of https://github.com/SuperEpicNothing/TextAdventure

Conflicts:
	.gitignore