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
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.
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
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 denali

# By Margaret
# Via Margaret
* 'master' of github.com:DMP-Capstone/TableMaster:
  These are the files affected from the new answer update that made it now a pivot table for questions and users.
  The following things were changed:
  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.
  Please look through each file. The following were changed (i may not grab them all):