voting Post accepted
nic
Merge branch 'marek'

Conflicts:
	templates/main.html