Commit
Merge branch 'master' of https://github.com/joarder/DDBMSsim.git

Conflicts:
	DDBMSsim/src/jkamal/ddbmssim/main/DBMSSimulator.java
	DDBMSsim/src/jkamal/ddbmssim/workload/WorkloadGenerator.java
Merge branch 'master' of https://github.com/joarder/DDBMSsim.git

Conflicts:
	DDBMSsim/src/jkamal/ddbmssim/workload/WorkloadGenerator.java