after of this commit remember do a git reset hard
Merge branch 'master' of github.com:mythern/shiny-octo-shame