Merge branch 'master' of https://github.com/MoJInterns/FeeFinder

Conflicts:
	app/controllers/fees_controller.rb
	app/views/fees/index.html.erb