vote fixed.
Merge branch 'master' of github.com:vngrs/talk-techly-to-me

Conflicts:
	app/controllers/Application.scala