Added Voting
Merge branch 'master' of github.com:WhitespaceIO/Whitespace_Platform

Conflicts:
	config/routes.rb