Resolving conflicts
checking if git works
Revert "Resolving conflicts"

This reverts commit 8d51ede72c93cdaba6214794b36702e06b77c230.
We have a funcioning profile page!
Resolving merge conflicts