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

Conflicts:
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/R$id.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/R$layout.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/R$menu.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/R$string.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/R$style.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/R$styleable.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/controller/IngredientsAdapter.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/controller/IngredientsFridgeAdapter$1.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/controller/IngredientsFridgeAdapter.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/controller/RecipeAdapter.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/AddIngredWizardActivity$AddIngredDiaglogFragment.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/AddTitleDescWizardActivity$setPasswordFragment.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/IngredientsFridgeActivity$AddIngredDiaglogFragment.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/MainActivity.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/SearchActivity$3$1.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/SearchActivity.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/SearchIngredientResultActivity.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/ViewDetailedRecipeActivity$1$1.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/ViewDetailedRecipeActivity$AuthenticationDiaglogFragment.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/ViewDetailedRecipeActivity.class
	C301W13T12Recipes/bin/classes/ca/ualberta/c301w13t12recipes/view/ViewListActivity.class
	C301W13T12Recipes/gen/ca/ualberta/c301w13t12recipes/R.java