made changes, not needed
Merge branch 'master' into mike

Conflicts:
	app/routes.php
removed file - not neccessary
Moved create-edit blade to temporary folder
Moved create-edit blade back into lower case folder name
seeded user table of db
Merge pull request #8 from sweetrocker22/db-greg

Db greg
customizing index & master.blade
Merge pull request #9 from sweetrocker22/mike

Mike
Merge branch 'master' into caitlin

Conflicts:
	app/controllers/HomeController.php