Added first static guy, fixed one conversation length bug
Merge branch 'master' of https://github.com/DavidSaxon/M.A.F.I.A

Conflicts:
	js/game/game.js