sup
Merge branch 'master' of https://github.com/AuthorOfTheSurf/tripping-adventure

Conflicts:
	MSet$MSetIterator.class
	MSet.class
	MSetTest.class