added twilio and an endpoint
added twilio and an endpoint
fixed merge conflicts