Merge pull request #33 from PixelOrange/master

Major wiki revision