Signed-off-by: claire921 <claire921@gmail.com>
Merge branch 'master' of https://github.com/alexfz420/DSG.git

Conflicts:
	DSG/WebContent/simulation.html
	DSG/smallTest.log
Merge branch 'master' of https://github.com/alexfz420/DSG.git