Merge pull request #3 from thisMagpie/master

merge pages