create votes
Merge branch 'master' of github.com:Tho85/lunchpad

Conflicts:
	Gemfile.lock