Merge pull request #12 from ghuitster/master

Mostly finished my pages