Fear and chaos in /participant (already 3d in there so still less than I've worked) #V-3 worked
Merge branch 'master' of https://github.com/KernelCorp/vote

Conflicts:
	app/models/participant.rb