initial
Merge branch 'master' of https://github.com/TylerGarlick/products-test

Conflicts:
	.gitignore