user detail page colors
fixed merge conflicts
Merge pull request #96 from tdoshi/master

user detail page