i hate george, AKA newRecipe done button stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Team07RecipeFinder/src/ca/ualberta/cs/team07recipefinder/NewRecipeActivity.java