Broken
Merge remote-tracking branch 'origin/master'

Conflicts:
	CircuitGame/src/poo/trab2/circuit/TestingMain.java