Another commit
Tweaking index page
Merge branch 'master' of https://github.com/magshi/shop-with-conscience

Conflicts:
	templates/index.html
Fixing merge