making rspec and cuke tests work
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti

Conflicts:
	app/controllers/application_controller.rb
	spec/controllers/pictures_controller_spec.rb