sruff
Merge branch 'pr/1'

Conflicts:
	js/scripts.js
images
hygiene ratings