Merge pull request #1 from extremezoo/master

okokok
Merge pull request #2 from extremezoo/ghpages

Merge pull request #1 from extremezoo/master