sdf
Merge branch 'master' of https://github.com/rhotep/schulze-ballot

Conflicts:
	public/static/js/directives.js
add background image