The basics of this feature
The beginnings of the user profile page
Adding in more details about the user
Adding in some basic information about the user
Fixing a merge conflict