Added sprite maps, animations and a player
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.js
Fixed merge problem