preparing to resolve incoming merge
Resolving merge conflict, restructuring folders, twilio working
resolving merge conflict in gemfile and environment
Adding serialize for queue in party model.
Creating a seed file.
Merge branch 'master' of https://github.com/woodchucks-2014/SuprStar.me into seed_file
"Merging with upstream master"
Seed
twilio feature testing, work in progress
Generating a youtube controller.
Revising validation for user phone number to include Twilio format +1
updating read method to only read latest text sent
Twilio response logic for not user in working order
Editing gemfile
Adding fuctional method to find videos based off input as well as other method skeltons.
Completing Twilio logic, in working order
Revising Models & Migrations to reflect completion of Twilio integration
deleted notification model and migration
Caught syntax error, line 16 hashtag
Fixing merge conflicts
attempting new logic, still a work in progress