Added comments to Search By Flavor and Search by Ingredient
Advanced Search now says "Coming soon" instead of "Hello World"
Try Something New now goes to Results page
Merge conflict: must commit properties
resolving merge conflict
Resolving conflicts still
Merge branch 'beta' of https://github.com/teamGaia/OneDrinkAway.git into
beta

Conflicts:
	OneDrinkAway/project.properties