com1
Merge branch 'master' of github.com:onliq/dcf

Conflicts:
	controllers/getNews.php
	template/style.css