Basics set up for django rest framework/marvel demo:
- Merchants
- Products
Merge branch 'master' of github.com:juan-ordergroove/marvel_demo

Conflicts:
	.gitignore