commint testcase`
Merge branch 'master' of https://github.com/daitr-gu/cloudsim_simulator_v2.0

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