updates to userpage
Merge branch 'master' of https://github.com/Markko/CSCI3130-Project