initial commit
Merge branch 'master' of https://github.com/kevrom/shopkeeper

Conflicts:
	README.md