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

Conflicts:
	Gemfile.lock
Merge branch 'master' into frontend

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb