commit to pull
Merge branch 'master' of https://github.com/daitr-gu/scheduler_simulation

Conflicts:
	src/org/cloudbus/cloudsim/simulate/Simulate.java
	src/org/cloudbus/cloudsim/simulate/testcase.json