Working Netcode,
Please lord don't break everything.
Trying to fix these commit errors
Merge branch 'master' of
ssh://git@github.com/CMPUT301W13T03/classproject.git

Conflicts:
	RecipeTestTest/src/ca/c301/t03_recipes/test/HTTPTest.java
	RecipeTestTest/src/ca/c301/t03_recipes/test/RecipeStorageTest.java
	src/ca/c301/t03_model/RecipeManager.java
	src/ca/c301/t03_recipes/EditRecipeActivity.java