Fixes merge conflics
fixes problem in main css file
Adds news site
Adds markup for the news page