Adding image functionality to recipes and create new recipe activity
Merge branch 'master' of ssh://git@github.com/Torboto/cmput301W13T07.git

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