ticket:1 typo fix in makefile
Merge branch 'barista'