scaffold share_medical_request
scaffold photos
commit site
remove share_medical_request
-see design document
commit photo. Works AFAIK
Merge remote-tracking branch 'origin/master' into working

Conflicts:
	SalkehatchieB/app/controllers/photos_controller.rb
	SalkehatchieB/app/models/photo.rb
	SalkehatchieB/app/views/photos/_form.html.erb
	SalkehatchieB/app/views/photos/index.html.erb
	SalkehatchieB/app/views/photos/index.json.jbuilder
	SalkehatchieB/app/views/photos/show.html.erb
	SalkehatchieB/app/views/photos/show.json.jbuilder
	SalkehatchieB/test/controllers/photos_controller_test.rb
	SalkehatchieB/test/fixtures/photos.yml
Merge remote-tracking branch 'origin/working'

Conflicts:
	SalkehatchieB/app/controllers/sites_controller.rb
	SalkehatchieB/app/views/sites/_form.html.erb
	SalkehatchieB/app/views/sites/index.html.erb
	SalkehatchieB/app/views/sites/index.json.jbuilder
	SalkehatchieB/app/views/sites/show.html.erb
	SalkehatchieB/app/views/sites/show.json.jbuilder
	SalkehatchieB/config/routes.rb
	SalkehatchieB/test/controllers/sites_controller_test.rb
	SalkehatchieB/test/fixtures/sites.yml