Crazy Changes
Merged

Merge branch 'master' of https://github.com/nhazekam/DEvSim.git

Conflicts:
	DEvSim/src/process/Event.java
	DEvSim/src/process/Process.java
	DEvSim/src/resources/Storage.java
Extravagant Changes
Merge branch 'master' of https://github.com/nhazekam/DEvSim.git