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

Conflicts:
	src/machines/Kettle.java