added twilio gem
 merged changes
Changed routes
Fixing merge
Deleted controller