initial commit
Merge https://github.com/popwarfour/GoFish