User page working
Merge branch 'master' of https://github.com/JamieWoodbury/Dinr

merging pull
additional user page updates
Merge branch 'master' of https://github.com/JamieWoodbury/Dinr