bug fixes
Merge branch 'master' of https://github.com/raduvatav/polls

Conflicts:
	templates/finish.php