adds stuff back into the user profile page
solves merge conflict
changes user profile page
Merge branch 'master' of https://github.com/pocus/mondiale