Added input to the framework
Merge branch 'master' of https://github.com/rikoophorst/messing-with-pixi

Conflicts:
	src/js/core.js
	src/js/game.js