nothing
Merge branch 'master' of https://github.com/alicjasalamon/System-Modelling-and-Simulation---project

Conflicts:
	EMAS/simulation.py
	EMAS/src/main/resources/age.properties
	EMAS/target/classes/age.properties
script reverted
clean up