Merge pull request #2 from shoffmand/master

3 new pages
Merge pull request #1 from wet-boew/master

Merge pull request #2 from shoffmand/master