Add and configure twilio to send SMS to unregistered users
Merge branch 'master' of https://github.com/Face-Off/faceoff

Conflicts:
	package.json
Fix merge conflict in routes.js for CORS
Clean merge conflict package.json & remove  package.json.orig and npm-debug.log
Merge pull request #20 from TheMadKoder/master

Add and configure twilio to send SMS to unregistered users