pre-pull
fixed conflicts
Merge pull request #41 from rasbabbo/master

added basic twilio
gem added/database.yml updated
gem updated/database.yml updated, space removed line 2user/edit
twilio sending invitations
added challenge field to login
twilio mostly working
pre pull
Merge pull request #42 from marklc44/master

twilio sending invitations
afterpull
updated logout and user/edit to accomodate challenge id
Merge pull request #43 from joemeers82/master

gem files changed
Merge branch 'master' of https://github.com/mjminc/project2

another merge