Fixed merge conflicts in package.json
Created smsTester html and modified sms controller
Created smsTester html and modified sms controller, implemented sms sending feature, .env variables
Implemented authcode model, part-way through code verification
Merge branch 'feature/sms' of https://github.com/sgtonkin/greenfield into feature/sms

Conflicts:
	client/smsTesting.html
	server/sms/smsController.js
Merge pull request #34 from dduugg/feature/grunt

add grunt, jshint, and jscs
Finished post request handlers for verify and send sms
Merge branch 'master' of https://github.com/warring-hail/greenfield into feature/sms

Conflicts:
	example.env
	package.json
	server/config/middleware.js
rm client/smsTesting.html
Merge pull request #35 from sgtonkin/feature/sms

Created routing, post handlers and models to send and verify phone numbers for sms
fix linter warnings
Merge pull request #36 from dduugg/feature/lint

fix linter warnings merged
Edited sms files for receiving function, uncommented user and charity routes so that server works again.
added missing semi-colon and blank line at end of document.
Merge pull request #37 from rustinpc/smsChoice

Edited sms files for receiving function and added schema to new sms model
Began scafolding out utility for sending donation texts
Configured mongo locally to load users
working form and userschema template
signup.js syntax cleaned
Added send donation text feature code, added underscore to package, created model for sentMessages