solr segments.gen file apparently modified
fixed merge conflict
working on smart redirect
updated .gitignore
adjustments to route_user method to account for nil session[:bid_data]
implemented smart redirect for non-logged-in registered user that submits a bid, logs in, adds credit card info and is then redirected to auction page
non-logged-in registered user with valid cc submits a bid, logs in and is redirected to auction page
implemented code and tests for non-logged-in non-registered users who submit bids, signs up with a credit card or without
fixed type in user_auction_page_spec
Logged in user who submits a bid is given the option to navigate to their profile page where they can add a valid credit card and be redirected back to auction page to submit a bid
modified logic to clear biddata in session
Fixed merge conflicts and made minor changes to auction show page