Change mc dizzle mc shizzle
Merge branch 'master' of https://github.com/RikoOphorst/messing-with-pixi

Conflicts:
	src/js/game.js