Nightime
Merge branch 'master' of https://github.com/iburinoc/mafia

Conflicts:
	gamemaker.js