just a lil test
just testin'
Merge branch 'master' of https://github.com/nking52/mcMMO

Conflicts:
	test.txt