comm
Merge branch 'master' of github.com:3jsirios/mafia

Conflicts:
	mafia-client/bin/Mafia/Controller.class
	mafia-server/bin/mafia/Main.class
adsf