Merge branch 'working_branch' of https://github.com/DSegal92/case_cycling_members into working_branch

Conflicts:
	db/schema.rb