Fixing bad rebase
Merge branch 'master' of github.com:bfosberry/GameSocial