First Commit
Merge branch 'master' of https://github.com/djamseed86/Storefront

Conflicts:
	.gitignore