premerge
Merge branch 'master' of https://github.com/jb38/cs474-simulation
added delay