fixed merge pain.. some how!
added example pages
0.8