separating play/edit states
Merge branch 'scene1' of https://github.com/gelobi/web-full-of-color into scene1