Merge pull request #15 from andredempsey/andrew

sending Andre code
commiting files
adding missing files
conflicts resolved
Merge pull request #16 from andredempsey/nicole

Nicole
revised model to create a central user table for both donors and charities; updated user dashboard CRUD operations
Merge pull request #17 from andredempsey/andrew

changes made to all charities folder blades
Merge pull request #18 from andredempsey/andre

revised model to create a central user table for both donors and chariti...
adding files for merge
Merge branch 'master' into nicole

Conflicts:
	app/controllers/HomeController.php
	app/controllers/UsersController.php
	app/models/Charity.php
	app/routes.php
Merge pull request #20 from andredempsey/nicole

Nicole
changes made to charites controller, model, form