balancing
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/examples/potter/spells.yml