add tests for charitiesController
Merge branch 'master' of https://github.com/warring-hail/greenfield into feature/charities-spec
fixed sentmessage func
disable travis emails
Merge branch 'master' of https://github.com/warring-hail/greenfield into feature/travis-email

Conflicts:
	server/sms/sendDonationText.js
trim zip
styled user entry form
styled user entry form
Merge pull request #68 from dduugg/feature/trim-zip

trim zip
Merge pull request #67 from dduugg/feature/travis-email

disable travis emails
Merge pull request #69 from sgtonkin/styling/userform

Added bootstrap and other css styling, trimmed fields on user form
Merge pull request #66 from dduugg/feature/charities-spec
Modify env variables to new Twilio account and Bernie's phone number.
Small change to home page to test deployment.
Merge pull request #5 from bernardchu/master

Pull from upstream, add env vars, test deployment
change server env variable back to include mongo URI.
Merge pull request #6 from bernardchu/master

change server env variable back to include mongo URI.
fixed merge conflict