not sure
Merge branch 'master' of https://github.com/nixxon111/Mafia
fixed commit complications
Conflicts:
	roles.py
Merge branch 'master' of https://github.com/nixxon111/Mafia
new update by Nico