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

Conflicts:
	.idea/PSMS.iml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
	.idea/workspace.xml
	app/routes.php
	app/views/layout/master.blade.php