database configuration
database configuration
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
	app/config/database.php
database design