Fixed hover effect on logo bg in nav bar
Merge branch 'master' into sam

Conflicts:
	app/assets/javascripts/votes.js
Added multiple color schemes for 'yes/no' button options