Initial Commit
Initial commit
Merge branch 'master' of https://github.com/KevinMarete/UPID

Conflicts:
	README.md
Incident Report
Put Headers in Dashboard
Merge branch 'master' of https://github.com/RufusMbugua/UPID

Conflicts:
	.htaccess
	.project
	README.md
	application/config/database.php
	application/controllers/c_front.php
	application/views/index.php
	css/bootstrap.css
	css/styles.css
Merge branch 'master' of https://github.com/RufusMbugua/UPID

Conflicts:
	.project
	application/controllers/c_front.php
Merge branch 'master' of github.com:RufusMbugua/UPID
Merge branch 'master' of github.com:KevinMarete/UPID
New entities+modified db