migrations, models, and tables
Merge pull request #1 from RyanSnodgrass/migrations

migrations, models, and tables
Merge branch 'twilio-riaz'

Conflicts:
	db/schema.rb