Fixing bad nil error
Fixing nil bug in user controller
Merge branch 'master' of github.com:bfosberry/GameSocial