deleted, will pull from master
resolving issues
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