Woo aw well.
Machine local.
Merge branch 'master' of github.com:MerreM/WebStore

Conflicts:
	mainstore/models.py
	scripts/create_wines.py
	webstore/settings/local.py