tag v1.2
da785ba630b14ba7e158f2af9105d01c4af59a98
Jordon <jordon@localhost>
2015-01-26 04:12:13 -0800

Tagging as v1.2


--------------------

Jordon:
	- update default drinks
