Merge pull request #28 from dawgtrades/master

merge
auction item almost done
Merge pull request #91 from jrec15/master

auction item almost done