changing bootswatch to readable theme
merge with development, clearing conflicts
merge with development, clearing conflict in auction params
cleaning up layouts, styling, working on bids show partial but it's erroring out in views
putting back show partial to original
spencer time circles
hopefully this is clean
clearing second merge conflict
clearing auction.rb conflicts
pushing up cleared conflicts