Finished the ratings
Trying to match merge conflicts
Fixing merge commit
Merge branch 'andrews'

Conflicts:
	public/stylesheets/main.css
Merge branch 'eduard-5'
Merge branch 'master' into eduard-5