Attempting to fix timing issues cross-platform
Merge branch 'master' of github.com:bawjensen/COMP-500-IndependentResearch