commit
Initial commit
Merge branch 'master' of github.com:mcmbrest/shopsapi

Conflicts:
	README.md
commit
commit