Update simulation
Merge branches 'develop' and 'develop' of github.com:catlikethief/auction into develop