pulled regex fixes
Merge branch 'back' of github.com:thejerrybao/CaravanParty into back
Merge branch 'back' of github.com:thejerrybao/CaravanParty into back
wrote tests for friends.rb