Setting up git repo
Merge branch 'master' of https://github.com/joleal/barbara