did some stuff with the recipe database
Merge branch 'master' of https://github.com/se-SteveThePirate/CMPUT301W13T01

Conflicts:
	NewRecipeBook/.classpath