fixes merge conflicts, restores user show page
Merge pull request #32 from ilanasufrin/emily

fixes merge conflicts, restores user show page