Simulation engine nearly finished
Merge branch 'master' of https://github.com/sklum/cse870
Commented out code that doesn't compile