bajsade kod, this is doge
Merge branch 'master' of https://github.com/sophiacaspar/lab5

Conflicts:
	state/SimState.java