Please look through each file. The following were changed (i may not grab them all):

	index - will eventually change format of the form to blade
	Controllers: in controllers I added a mutator to hash the password (no need to hash anywhere else)
	Created two beginner models Post and User. User is used to save the data to the table
	routes: deleted the hostguest route
update for migration and new file added to json composer

Merge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch
Added what was mysteriously deleted after I tried to commit and push.
I changed the format of the forms on the signin modal for blade. Methods for signin and signup should both work. Set a var to email for future verification functionality. For now have not added anything extra but comments.
Merge pull request #8 from DMP-Capstone/patricksbranch

Patricksbranch - some detail-related remarks that cam be postponed til later but overall great work!
Approved Patricks changes/updates to our views and some minor changes to css files.
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch
Added app id to facebook.js
Added fb js to master blade
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into denali

# By Patrick Rodo (16) and Margaret (1)
# Via Margaret (3) and Patrick Rodo (2)
* 'master' of github.com:DMP-Capstone/TableMaster:
  Fall back picture in place of video
  Added styling for navbar and terms of service page
  Changed terms of service to Host N Dine's
  Added a class to each navbar link to style color and wrapper home link with h1 tag
  Added Varela Round Google font
  Created terms of service page
  Changed title and added container to fix spacing issue
  Replaced copyright with actual website name
  Created mockup of Be A Host page.
  Added toggle feature for filter button.
  Styling for "Find A Table" page created.
  Added Header section and fixed code spacing. Still rough mock up and needs work.
  Created mockup of "Find A Table" page
  styling for user's profile page
  Created rough mockup of user's profile page.
  Started rearranging design of "about company" below the video. Still a work in progress
  I updated our tables to have the first and last name on the users table please run migrations to update your database. This makes it easier to add the first and last name from the signup form since at this time no relationship between the two (profiles and users) have been set.

Conflicts:
	app/views/howitworks.blade.php
Added Facebook like and share widgets
Merge pull request #9 from DMP-Capstone/denali

Great work.
The following things were changed:

-Added migration to include a user_id column on the profile table
-Updated both the user and profile models to include the method for setting up the foreign key/ 1:1 relationship

-MM
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch

Conflicts:
	app/views/partials/sign-up-in-modals.blade.php
These are the files affected from the new answer update that made it now a pivot table for questions and users.
Merge pull request #10 from DMP-Capstone/margaretBranch

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

Conflicts:
	app/views/howitworks.blade.php

Fixed How It Works Merge conflict