Testikommitti (demoan merge conflictia)
Merge branch 'master' of https://github.com/iGEM-QSF/SimCircus

Conflicts:
	sim.py