add coffee
coffee update
webapp update
Merge branch 'neat-examples'

Conflicts:
	README.md