Add colors
Merge branch 'master' of https://github.com/luiges90/sqjs

Conflicts:
	js/entity.js
player and enemy classes