Shopping list hardcoded stuff
div id='products' moved in wrapper
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html