-work on camp controller
Merge branch 'master' of https://github.com/Manifold0/salkehatchieB

Conflicts:
	SalkehatchieB/app/controllers/camps_controller.rb
	SalkehatchieB/db/schema.rb