Simulation correction
Merge branch 'master' of https://github.com/IEEECS-VIT/GPL

Conflicts:
	Final_Simulation/simulation.js