tiny change
trying to fix git merge problems
Merge branch 'master' of https://github.com/rebeccaj/SFMTASimulation

Conflicts:
	SFMTASimulation.java