Adding back gemfile.lock
Adding gemfile.lock to gitignore
gemfile.lock
Change edit and delete buttons to icons
Add styling to show page
gemfile.lock
Merge branch 'master' of https://github.com/mud-turtles-2014/TheSpot
merge
Merge branch 'style_show_page'
resolving conflicts
Merge pull request #24 from nicollequintero/styling_spot_page

Styling spot page