fixed up history
Merge branch 'master' of github.com:vito-c/pirate-setup