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

Conflicts:
	src/items/Machine.java