test
Merge branch 'master' of https://github.com/JoshuaSenouf/small-world-utbm

Conflicts:
	src/smallworldutbm/testMeuh.java