Added the pages
Fixed merge error in stylesheet.css