Here are the user controllers changes, routes, views etc
removed comments
Auction Methods. Changed User.rb
basic user show jquery
resolving last conflict on users show
Merge branch 'master' of github.com:trinityXmontoya/project_2 into user_profiles
4/29 morning merge
morning 4/29 merge
user show finished
Merge branch 'development' of github.com:trinityXmontoya/project_2 into AuctionsShowPage
AuctionsShow, changed bootstrap, changed messaging
Update users_controller.rb
Merge pull request #20 from trinityXmontoya/AuctionsShowPage

Auctions show page
Bids Controller New/Edit, Auctions Controller Show/Edit/Destroy
Merge branch 'development' of github.com:trinityXmontoya/project_2 into AuctionsShowPage
nest bids under auction routes
Merge pull request #21 from trinityXmontoya/AuctionsShowPage

Auctions show page merge, controller update
add calculate_time_left method for auction
add img_url attribute to auctions
user show done