updated some branding
Merge branch 'master' of https://github.com/bradoyler/gitflow