foo bar
Merge branch 'master' of github.com:julencja/wf-mvp

Conflicts:
	css/style.css
added item thumbnails to cart view
Merge branch 'master' of github.com:julencja/wf-mvp

Conflicts:
	css/style.css
	index.html