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