commt
Merge branch 'master' of https://github.com/TrashTonyLin/CoffeMenu

Conflicts:
	CoffeeMenu.xcodeproj/project.pbxproj