edit not working. looks like an sql or pictues error
Merge branch 'master' of git@github.com:Torboto/cmput301W13T07.git
comments
can see the done button now
Merge branch 'master' of git@github.com:Torboto/cmput301W13T07.git

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