Made two seeders. They don't run.
Added faker to composer.json. Added seeders for users and profiles. Multiple edits to migrations: added timestamps to all tables, changed zip on profiles table from int to string. Commented out search function in HomeController.
Added MenuController.
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into denali

# By Patrick Rodo
# Via Margaret (3) and Patrick Rodo (2)
* 'master' of github.com:DMP-Capstone/TableMaster:
  Recommitted. Nothing Changed. Attempting to fixed issues I'm having locally with my local branch ahead by one.
  Removed form. Not suppose to be on this page. Meant to be on edit profile page.
  Switched name of controller to # for now.
  Deleted unnecessary files in view and moved them into their appropriate 'menu' and 'profile' directories that I created within view. Changed spelling of cuisine
  Fixed Issues With My Pull Requests
  Default pictures for profile
  Created a simple form to edit menus. Might be merged with add menu form so we only use one form.
  Created simple form for creating a menu
  Removed all styling for custom navbar. Made default navbar have black links. Added styling for forms on edit profile page.
  Added include for navbar in Terms Of Service
  Stripped the profile page of its content. This will be what it looks like right when someone signs up. Still need to change color of default profile picture and size and shape of review stars
  Removed parallax container so we can include a container for the video
  Removed custom navbar and replaced it with an include for the general navbar we have that will be used on each page
  Changed the name of "Filter By Tags"  to "Filter By Cuisine"
  Created the view for editing a profile
  Basic form for editing menus
  Fixed design issues with Be A Host page. Only thing left to be added is content.
  Added edit profile method in controller
  Added editProfile routes
Merge pull request #21 from DMP-Capstone/margaretBranch

Margaret branch
Made menu controller and model. Added route for menu resources.
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into denali

# By Margaret
# Via Margaret
* 'master' of github.com:DMP-Capstone/TableMaster:
  changed question file to extend basemodel
  Trying to get all files rightfully updated. With these they are.
  migration update for the menus table
  These are the migration files to include all column values for the tables.
  Deleted old migration files and changed route to go to resource profilecontroller.
  Changed models to extend basemodel
  Changed Home Contrller
  Changed question model to extend eloquent. other files were used to update profile resource route.
  U"pdated login and logout wit register.
  trying to get branch up to date
  post model was wrong created another user class. fixed.
  the navbar information i was talking about
  I added a User Controller and updated method for profile within. goal is to be able to grab info from the logged user inside the profile table. Once working can use to build profile page and make home page more engaging.
  Files for migration added some code for the signup to show name when logged in. Not working at moment..

Conflicts:
	app/controllers/HomeController.php
	app/database/migrations/2014_12_12_213533_create_posts_table.php
	app/database/migrations/2014_12_12_221128_create_profiles_table.php
	app/database/migrations/2014_12_15_191053_create_answers_table.php
	app/database/migrations/2014_12_16_172630_create_menus_table.php
	app/database/migrations/2014_12_17_164310_create_messages_table.php
	app/routes.php
Fixed syntax on down function in update profile table migration. Fixed misnamed class. Added parent folder to views in MenusController. Removed unnecessary copy pasta from Menu model. Changed name of function from menu to user. Added relationship of menus and user in User.
Removed else statements. They aren't necessary because we don't want any text involved with our Social Media buttons
Styling for Sign In modal is finished. I'll go back and tidy up the Social Media buttons once we're done with all the functionality for the rest of the site.
I stripped all the filler information from the Find A Table page. HTML/CSS is still intact. Once we implement faker the menus will pop up and look the way they're suppose to.
Removed backslash before BaseController. Changed periods separating file and subfile in MenusController to forward slashes. Added question in a comment on createmenu.blade
Commented out the block of code Denali said to comment out. It was broken.
Sign In modal styling is completed (excluding Social Media Buttons. I'll come back to those once we have the functionality of the entire website finished.)
Tried to style the Edit Profile page, but controllers & routes were missing at the time so I couldn't view it rendered on the web. Once I pull master after this push I should be able to see it rendered if the controller & route is set up properly.
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into patricksbranch

Conflicts:
	app/controllers/HomeController.php
	app/views/partials/sign-up-in-modals.blade.php

Settled Merge Conflicts
Had a typo in the action. "dologin" changed to "doLogin"
Merge pull request #19 from DMP-Capstone/denali

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

Conflicts:
	app/controllers/HomeController.php
	public/javascript/facebook.js

Fixed Merge Conflicts. Referred to master and chose to keep those instead of what I had.
Merge pull request #22 from DMP-Capstone/patricksbranch

Patricksbranch thanks look good. Merged.