Login view
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch
All files up to now
fkldslfd;lkdjsaklMerge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch

Conflicts:
	app/controllers/HomeController.php
	app/controllers/ProfileController.php
	app/routes.php
	composer.lock
updated
files
Updated login, for now use existing users with actual profiles
all
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch

Conflicts:
	app/controllers/ProfileController.php
Merge pull request #41 from DMP-Capstone/margaretBranch

Margaret branch. Need code right now
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into denali

# By Margaret
# Via Margaret (4) and Patrick Rodo (1)
* 'master' of github.com:DMP-Capstone/TableMaster:
  all
  Updated login, for now use existing users with actual profiles
  files
  updated
  All files up to now
  Login view

Conflicts:
	app/controllers/HomeController.php
	app/routes.php
	app/views/partials/navbar.blade.php