initial comit
Merge branch 'master' of https://github.com/Conlectus/fish

Git is a dumb