fixed conflicts
Merge branch 'master' of github.com:wvmitchell/SocialSmarts