merge e pans
Merge branch 'master' of https://github.com/uspgamedev/circuit-of-mana-godot

Conflicts:
	prototypes/uspgamedude/main.xscn