Merge pull request #35 from andredempsey/andrew

Chris changed stuff.
Donor and charity registration
fixed home and master blade, fixed charities controllers and routes
Merge pull request #36 from andredempsey/nicole

Nicole
fixed conflicts

Merge branch 'master' into andrew

Conflicts:
	app/controllers/CharitiesController.php
	app/views/layouts/master.blade.php