new
logo
changed logo.png
news/index.php
Merge branch 'master' of https://github.com/immortalinfidel/colappserver

Conflicts:
	.idea/workspace.xml
	application/views/home/index.php
	application/views/news/index.php
	application/views/template/default/header_menu.php