Merge branch 'develop'
Merge branch 'master' of https://github.com/ednapiranha/gopher.meatspac.es
fixed dat jolly roger (ง ͡ʘ ͜ʖ ͡ʘ)ง
Merge pull request #16 from brianshumate/master

Fixed mah Jolly Roger