preparing to resolve incoming merge
Resolving merge conflict, restructuring folders, twilio working
resolving merge conflict in gemfile and environment
Merge branch 'master' of https://github.com/QuigProQuo/SuprStar.me into twilio_testing