add twilio functionality
Merge branch 'master' of https://github.com/lydiaguarino/BringUp

Conflicts:
	Gemfile
	config/routes.rb