Added goat stuff
Merge branch 'master' of https://github.com/magkur/Zoo