fixs
Merge branch 'gh-pages' of https://github.com/MissionBit/electronic-dreamers into gh-pages

Conflicts:
	greenflyer/js/entities/entities.js