beautifying all users page
adding posts to the users page
removing tmp to see if thats the source of the conflict
trying to resolve conflicts
Merge pull request #42 from smonette/user-update

User update