Merge branch 'master' of https://github.com/KernelCorp/vote

Conflicts:
	app/controllers/votings_controller.rb