Abi resolved merge conflict in Gemfile.lock
Added show action and corresponding user profile page
Merge pull request #6 from feministy/user_profile

User profile - Looks great!