fixed merge conflit and new page structure
Merge pull request #7 from othullo/master

separated and linked pages