Made content changes
Merge pull request #225 from extremezoo/Everett's-branch(6/5/14)

Made content changes