merge conflict resolution
Merge branch 'master' of https://github.com/motherjones/syria_lean

Conflicts:
	dev/css/syria_vote.css
	dev/css/syria_vote.less