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

Conflicts:
	bin/control/Main.class
	src/control/Main.java