Signed-off-by: perogi <mattpiroddi@gmail.com>
Merge branch 'master' of https://github.com/Xpostfacto/Text-Adventure

Conflicts:
	bin/.gitignore