okok
Merge pull request #247 from extremezoo/Everett's-branch(6/5/14)

okok
Merge pull request #248 from extremezoo/master

updating site