First open source commit for Barista
Merge branch 'master' of github.com:ICGGroup/Barista