s
Merge remote-tracking branch 'origin/master'

Conflicts:
	Magicnation/com/juanwan11_magicnation/MagicnationGenerator.java