adding basic drink calculator
Merge branch 'master' of https://github.com/spnce/symposiarch

Conflicts:
	lib/drink_action.py
merge