sdfa
Merge branch 'test' of
https://github.com/gycrazydog/distributed-algorithm.git into test

Conflicts:
	DA-Lab1/Resource/processes.properties
	DA-Lab1/src/nl/tudelft/da/lab1/process/Process.java
Merge branch 'test' of
https://github.com/gycrazydog/distributed-algorithm.git into test

Conflicts:
	DA-Lab1/Resource/processes.properties
modified process