changed the placement of the delete link, deleted the commented out code in the routes.rb
fixed merge conflicts
changed all the button icons, changed delete button to an actual image
changed the 'dont' in the title to a span and retilted it so that it doesn't affect the form
fixed merge conflicts
fixed the merge conflicts in CSS and the partials
Merge pull request #16 from gopher-snakes-2013/front-page-views

Front page views