Merge branch 'master' into margaretBranch
Merge branch 'master' into margaretBranch
Profile controllers working. make sure profile table has info to test. Destroy is lefted blank for now.
Merge remote-tracking branch 'origin' into margaretBranch
*profile controllers are working
*some code for verification and rules have been commented out...take a look
*updated login modal to reflect session flash for error
*added CSRF construct to basemodel for added security

-MM
Merge pull request #32 from DMP-Capstone/margaretBranch

Margaret branch
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into patricksbranch

Conflicts:
	app/views/layouts/master.blade.php
	app/views/partials/navbar.blade.php

Fixed merge conflicts. Went with master's navbar.