Merge branch 'master' into caitlin
Made sign in form functional on master layout. Created User model
Merge branch 'master' into caitlin
Merge branch 'master' into caitlin

Conflicts:
	app/views/layouts/master.blade.php
Created route, controller, and model for categories and list them
under category dropdown
Created route, controller, and model for categories and list them
under category dropdown
Minor changes
Minor changes
Merge pull request #12 from sweetrocker22/db-greg

Log in not working yet
Minor changes
Merge branch 'caitlin' of github.com:sweetrocker22/prosifter into caitlin

Conflicts:
	app/models/Category.php
	app/routes.php
Deleted lowercase u user.php
Merge branch 'master' into caitlin
Merge pull request #13 from sweetrocker22/caitlin

Caitlin
Deleted lowercase u user...again?
Merge branch 'master' into caitlin
Merge pull request #14 from sweetrocker22/caitlin

Deleting bad user model