test
committing is fun
Merge branch 'master' of https://github.com/kevinschaul/PlanMyMeal
Committing ingredient array adapter
Conflicts:
	src/com/csci5115/group2/planmymeal/CookActivity.java