Add initial color change for drink counter.
Add icon files for the drink counter.
Merge branch 'master' of https://github.com/wraziens/INFO6130

Conflicts:
	DrinkingApp/res/layout/drink_tracking.xml
	DrinkingApp/src/com/example/drinkingapp/Menu.java