wip
Repl working
Merge branch 'master' into js-dnd

Conflicts:
	public/css/lucky.css
	src/composer.coffee