Uh-oh. made changes
Merge remote-tracking branch 'origin/feat/assignmentsUI'

Conflicts:
	app/controllers/photographer_assignments_controller.rb
	test/controllers/photographer_assignments_controller_test.rb