squash dev commit. prep for v0.1
Merge branch 'master' of github.com:berwin9/esm-coffee

Conflicts:
	public/css/custom.min.css