add spider,floor,fish
Merge branch 'master' into gh-pages