Merging conflicts
Merge branch 'master' of https://github.com/teamGaia/OneDrinkAway.git

Conflicts:
	OneDrinkAway/src/com/onedrinkaway/app/IngredientFragment.java
Edited drink info help to match the new favorites heart