More Javadoc
Merge remote-tracking branch 'origin/master'

Conflicts:
	RecipeFinderTests/bin/classes/ca/ualberta/team2recipefinder/test/MyKitchenTest.class