finished controller methods and views for ingredients
added ingredient model tests
Merge branch 'master' of github.com:katiespiders/Ada-Cooks

Conflicts:
	katie/to_serve_man/app/controllers/recipes_controller.rb