fixed merge conflict
fixed merge conflict
seed file
recommendations index view
fixed button on mobile view
places
glyphs
Merge branch 'master' of https://github.com/NathanielWroblewski/tickets
Add route for saving an image to a ticket
Add public/system to .gitignore
Change has_attached_file attribute to imitatie thoughtbot's code
Change form_for ticket to correct syntax
Enable all ticket resource routes
Add linking to AWS S3 instance
Remove coffeescript file, no longer needed
default image working
Fix merge conflicts
Fix merge conflict
general cleaning of main page
Fix indentation error in haml file