created sample twilio functionality, testTwilio.rb
fixed merge conflict in schedule