Merge branch 'master' of https://github.com/tyrbo/tunefish
Merge branch 'master' of https://github.com/tyrbo/tunefish
Merge branch 'master' of https://github.com/tyrbo/tunefish
user show page has appropriate styling and follow button
user show page shows activity feed
Merge branch 'master' of https://github.com/tyrbo/tunefish into user_show_page
Merge pull request #34 from allisonlarson/user_show_page

User show page