fox: confirm flow in place
Merge branch 'master' of https://github.com/CooperativeOrganizationOfPeople/Brunch

Conflicts:
	brunch_buddy/brunch_app/views.py