resolved conflicts in Gemfile.lock
adding Gemfile.lock
added check to see if user is signed in before assigning current user id variable
merging changes that added AJAX and jQuery templates, and more twilio texting
added new signout path and delegate function listeners for invites
framework for making new invite path single page
Merge pull request #26 from kaplanoah/master

Initial framework for if we want to make new invite path single page