Proj properties
project
Merge branch 'master' of https://github.com/KevinMarete/UPID
Merge branch 'master' of https://github.com/JohnAdamsy/UPID

Conflicts:
	.project
Add Incidents
Merge branch 'master' of https://github.com/RufusMbugua/UPID