Add barista #184

Merged
merged 4 commits into from Sep 5, 2012