커밋을 안하니 pull이 안됨...
Merge branch 'master' of https://github.com/CienProject2014/Mafia.git

Conflicts:
	Mafia/src/game/Game.java