Merge
Merge branch 'master' of https://github.com/capchu/TextRPGOnline

Conflicts:
	rpgonline/app.py
no message
no message