Added the ability to take a photo and crop it. Needs to be added to
imageview and then added to the recipe/ingredient. button to add found
on add ingredient page.
Photo taking/adding nearly complete for ingredients.
Photo can now be seen in the ingredient list
Merge branch 'master' of github.com:CMPUT301W13T04/Food

Conflicts:
	res/layout/activity_add_ingredient.xml
	src/com/github/cmput301w13t04/food/ActivityMain.java
	src/com/github/cmput301w13t04/food/Activity_ViewIngredient.java
	src/com/github/cmput301w13t04/food/AddIngredient.java
	src/com/github/cmput301w13t04/food/Photo.java
Catch up with master branch