Merge branch 'dibaggioj'
Merge branch 'master' of https://github.com/Big-Bang-Game-Project/Big_Bang_Phaser

Conflicts:
	README.md