Latest_local
Merge branch 'master' of https://github.com/andreimarin90/dailynews

Conflicts:
	css/master.css