Caffeine label
Merge branch 'master' of github.com:ochococo/CoffeeKit

Conflicts:
	CoffeeKit/CoffeeKit/CoffeeCupVC.swift