join msg
Merge branch 'Master' of https://github.com/Mrmaxmeier/Text-like-Game-Framework

Conflicts:
	server/plugins/mafia.py