adding files
Merge branch 'master' into nicole

Conflicts:
	app/controllers/CharitiesController.php
	app/controllers/UsersController.php
	app/routes.php
views for pages with extended master.blade
comming master to nicole
Merge pull request #3 from andredempsey/nicole

Nicole