Initial commit
Merge branch 'master' of github.com:hi-res/lab-cicero

Conflicts:
	README.md