build out server/charity
Merge branch 'master' of https://github.com/warring-hail/greenfield into feature/server-charities

Conflicts:
	client/app/signup/signup.js
	server/charities/charityController.js
	server/charities/charityRoutes.js
	server/config/middleware.js
	server/users/userController.js
	server/users/userRoutes.js