adding files
Database schema diagram from MySQL Workbench
Merge pull request #1 from andredempsey/andrew

Test merge process
Merge branch 'master' into andre
updated database configuration
Merge branch 'master' into nicole

Conflicts:
	app/controllers/CharitiesController.php
	app/controllers/UsersController.php
	app/routes.php
Merge pull request #2 from andredempsey/andre

Resolved database local configuration setup issues
views for pages with extended master.blade
comming master to nicole
Merge pull request #3 from andredempsey/nicole

Nicole
set up the form for charities sign up
code is currently unfinished and pushing to get master up to date