added some of the new recipe stuff.
Merge branch 'master' of https://github.com/kevinschaul/PlanMyMeal.git

Conflicts:
	src/com/csci5115/group2/planmymeal/HomeActivity.java