added show page for
added background and styling
fixed merge conflicts
show pages showing something
added styling to auction page
pics are showing
merge complete
deleted schema orig file
fixed migration error
changed nav bar and fixed nav modals
starting new timer
Merge branch 'Zach2'
changed styling
changed styling
a
deleted Auction_id
db drop
Merge branch 'master' into samantha
deleted seed data
removed travis