starting new timer
Merge branch 'Zach2'
deleted Auction_id
Merge branch 'master' into samantha