Test Commit

Test Commit
Commit Test

Commit Test
Merge branch 'master' of https://github.com/nomismas/Munchkins

Conflicts:
	bin/core/Main.class
	src/core/Main.java