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
Merge pull request #7 from owen-d/master

merged latest changes from double-Upstream
fixed launch bugs
fixes #10