Initial commit
Merge branch 'master' of https://github.com/nfeiglin/collab-consumption

Conflicts:
	README.md