Edit form seems to work
Merge branch 'master' of https://github.com/KernelCorp/vote

Conflicts:
	Gemfile.lock
	db/schema.rb