Update TAMAYO
Merge pull request #14 from IfYouAreDan/master

Update TAMAYO