Conscience score explanation
Merge branch 'master' of https://github.com/magshi/shop-with-conscience

Conflicts:
	example.pyc
	templates/product.html