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

Conflicts:
	bin/graphics/G.class
	src/graphics/G.java