Add username to User, to navbar, add profile with picture
Merge profile and joke show page updates to master