hajin
Merge branch 'master' of https://github.com/CienProject2014/Mafia.git

Conflicts:
	Mafia/src/game/Game.java