cleaned up files, added user show page
Merge branch 'aug14500'
merged