1st edition
Merge branch 'master' of https://github.com/robyne/inventory

Conflicts:
	.gitignore