refactor in progress
Merge branch 'master' of https://github.com/maebe22/source-comp

Conflicts:
	app/controllers/HomeController.php
	app/controllers/MembersController.php
	app/routes.php
	app/views/dashboard.blade.php
	app/views/employees/createMember.blade.php
	app/views/employees/showMember.blade.php