sun stuff
Merge branch 'master' of https://github.com/AndyBarron/letitgo

Conflicts:
	js/entities.js