fixed code to account for race condition in update
Merge branch 'master' of https://github.com/uriahjb/Project3-Simulation