Creating create/edit view and making it work
Merge branch 'master' into caitlin

Conflicts:
	app/controllers/HomeController.php
Changed redirects to index where it said show
Merge branch 'master' into caitlin
Made sign in form functional on master layout. Created User model
Merge pull request #10 from sweetrocker22/caitlin

Caitlin
Merge branch 'master' into caitlin
fixing errors debuging posts
Merge pull request #11 from sweetrocker22/db-greg

fixing errors debuging posts
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
Log in not working yet
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