saida first commit
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	app/routes.php
	vendor/autoload.php
	vendor/composer/autoload_real.php
merging changes
testing
a
merging changes
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	app/routes.php
user module
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	app/routes.php
none
add datatype detail
add datatype detail
add datatype detail
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_real.php