Merge branch 'salo-dev' of https://github.com/civil-disobedience/votecheck into salo-dev

Conflicts:
	style.css
Score style merge fix