why doesn't the app work
fuck git
fuck git
Merge branch 'master' of https://github.com/eigenbloom/juego.js

Conflicts:
	Level.js
	Line.js
	Shape.js
	image.js
	test/Entity.html