fixed uncaught merge conflict
Merge pull request #29 from kelvinblade/master

merge
Access denied to user profile if not logged in