this version works for us all
Merge branch 'betterBranch' of github.com:tmacdona/BeSocial into betterBranch