Merge pull request #23 from sarlaf/working

Changes for pushing to heroku
missing file
Merge pull request #26 from MiriamNeubauer/master

(:thumbsup)
Adding twilio helper include statement back in
Another update to helper include statements
Merge pull request #27 from francisco/master

lgtm
More tests, adding functionality so user can join by passphrase, refactoring twilio helper.