Merge branch 'user' of https://github.com/CateRate/CateRate into user

Conflicts:
	www/css/style.css
Merge remote-tracking branch 'origin/user' into user