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

Conflicts:
	.idea/workspace.xml
data
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	app/controllers/FormController.php
	app/routes.php
	app/views/form/add.blade.php
	app/views/form/edit.blade.php
	app/views/form/index.blade.php
	app/views/layout/left_menu.blade.php
form