committing to import merge
Resolving merge conflict in notification controller and helper
 Merge branch 'master' of https://github.com/QuigProQuo/SuprStar.me
Merge branch 'master' of https://github.com/woodchucks-2014/SuprStar.me
Testing models, working order
cleaning up gemfile
Gemfile cleanup
Revising twilio logic
Merge pull request #15 from kaiprt/cleanup

Cleanup
pulling from upstream master, merging with updated logic in notification controller
preparing to merge new notification logic
Merge pull request #16 from kaiprt/cleanup

@kaiprt Cleanup merged
merging cleaned up upstream
resolving merge conflicts
Merge pull request #17 from QuigProQuo/master

@kaiprt @mendoncakr organized logic for notification controller
Adding method to retrieve queue in party, also fixed bug where youtube video would not play.