Our process has been worked on
Merge pull request #161 from extremezoo/Everett's-branch(6/5/14)

Our process has been worked on
Merge pull request #162 from extremezoo/master

updating site