updated server's sms routes, controller, and model to allow for receiving sms messages. not tested with twilio yet.
updated smsController after setting up twilio to use ngrok for testing.
updated server's sms routes, controller, and model to allow for receiving sms messages. not tested with twilio yet.
updated smsController after setting up twilio to use ngrok for testing.
fixed a couple of errors breaking server in sentMessagesModel and smsController after rebasing.
fixed one more error breaking server in smsController after rebasing.
Resolved conflict
user.js refactored for angular
refactored signup html and js files
working signup saves user to db
resolved merge conflict
refactored signup html and js files
working signup saves user to db
includes joinDate in user schema
Merge branch 'signupForm' of https://github.com/mlom/greenfield into signupForm

Conflicts:
	client/app/signup/signup.js
	package.json
	server/users/userModel.js
corrected syntax
updated for dougs comments
refactored for separate factory directory
Merge pull request #49 from mlom/signupForm

singupform updated
updated server's sms routes, controller, and model to allow for receiving sms messages. not tested with twilio yet.