gulp fix and phaser
Merge branch 'master' of github.com:rbuchmann/ludum

Conflicts:
	bower.json