make images work
Merge branch 'master' into products

Conflicts:
	index.html