moving things around and adding a few lines to get Cuke tests working
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti

Conflicts:
	app/controllers/dashboard/users_controller.rb
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti
cuke tests work, spec tests not so much
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti

Conflicts:
	app/controllers/dashboard/users_controller.rb
passing all cuke tests, spec tests still need work