Fix merge mistake
Merge branch 'master' of github.com:dck/yasma

Conflicts:
	public/scripts/index.js