fug
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/software/Add.class
	bin/software/Copy.class
	bin/software/Jump.class
	bin/software/Mul.class
	bin/software/Print.class