failing test
Merge branch 'master' into create_fishery

Conflicts:
	features/create_fishery.feature
	features/step_definitions/fishery_steps.rb
create a fishery
Fishery Controller specs passing
refactored fisheries controller spec
refactored fisheries controller spec
shotgun
jquery
destroy
Cleaned up view table
show view
#not tests
Removed cucumber
created CRUD Request Specs for Fisheries
Added Capybara, Poltergeist, Data Cleaner and Factory Girl
GET /reports, displays reports
Merge pull request #4 from cookiescrumbs/create_fishery

Create fishery