a little change
a little change
Merge branch 'master' of https://github.com/coniewt/CMPUT301W13T12

Conflicts:
	C301W13T12Recipes/src/ca/ualberta/c301w13t12recipes/controller/RecipeAdapter.java