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

Conflicts:
	Team2RecipeFinder/src/ca/ualberta/team2recipefinder/RecipeModel.java