Login view
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch
All files up to now
Merge pull request #39 from DMP-Capstone/patricksbranch

Patricksbranch
Fixed bug that only displayed all a user's menus after one was added (not on first load) by adding if statement in index and show in the ProfilesController. Added variable $menus in each, which retrieves all a user's menus.
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
Merge pull request #40 from DMP-Capstone/denali

Fixed bug that only displayed all a user's menus after one was added (not on first load)
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 patricksbranch

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

Fixed merge conflicts