.
Merge branch 'master' of https://github.com/HenkeJohansson/rateit

Conflicts:
	css/style.css