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

Conflicts:
	rpgonline/dataAccess.py
Merge branch 'master' of https://github.com/capchu/TextRPGOnline
no message