graphis
Merge branch 'master' of https://github.com/Lipxam/Ifloop2

Conflicts:
	bin/graphics/G.class
	bin/machines/Brick.class
	bin/machines/Kettle.class
	bin/machines/LaserIn.class
	bin/machines/LaserOut.class
	bin/machines/Lightbulb.class
	bin/machines/Looper.class
	bin/machines/Mirrior.class
	bin/machines/SolarPanel.class
	bin/machines/SteamReceiver.class
	bin/machines/Wire.class