x
Merge branch 'master' of https://github.com/NAMEs/ProductManager

Conflicts:
	README.md