merge
Merge branch 'master' into ZAch2
index page styled
added winnerID
add winner id to auction item