Refactored long method search() in RecipeModel and added methods
containsKeyword() and checkIngredientsForKeyword()
Merge branch 'master' of
ssh://git@github.com/lagecamp/CMPUT301W13T02.git

Conflicts:
	Team2RecipeFinder/src/ca/ualberta/team2recipefinder/model/RecipeModel.java
	Team2RecipeFinder/src/ca/ualberta/team2recipefinder/views/ViewRecipeActivity.java