merging changes
Merge branch 'master' of https://github.com/kelvinmbwilo/PSMS

Conflicts:
	.idea/workspace.xml
offence register
offence register
Merge branch 'master' of https://github.com/kelvinmbwilo/PSMS

Conflicts:
	.idea/workspace.xml
	app/config/database.php