Adding working app
Merge branch 'master' of github.com:hi-res/lab-cicero

Conflicts:
	public/app.js
	public/index.html
	src/app.coffee