Simulation correction
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final_Simulation/simulation.js