Added Home Page content, Styled news page better, added front end edit buttons to pages
Resolved conflicts