Some changes to RecipeModelTest
Some changes to IngredientTest to make it compile

Merge branch 'master' of
ssh://git@github.com/lagecamp/CMPUT301W13T02.git

Conflicts:
	RecipeFinderTests/bin/classes/ca/ualberta/team2recipefinder/test/RecipeModelTest.class
	RecipeFinderTests/src/ca/ualberta/team2recipefinder/test/RecipeModelTest.java