controller-view spec tests work, all controllers and views standardized
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti

Conflicts:
	config/database.yml
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti