merging changes
added about and contact pages
added admin checks