test
Merge branch 'master' of https://github.com/michaell308/Mafia-Game-Manager

Conflicts:
	README.md
Merge branch 'master' of https://github.com/michaell308/Mafia-Game-Manager

Conflicts:
	README.md