Conflict resolving
Conflict resolving
Conflict resolving
Merge branch 'master' of ssh://git@github.com/irhete/election.git

Conflicts:
	Valimised/war/Valimised.html
	Valimised/war/css/Valimised.css