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 pull request #10 from sweetrocker22/caitlin

Caitlin