Setting up
Merge branch 'master' of github.com:neobenedict/gazelle_dev