chuck jvais syncer
Merge remote-tracking branch 'origin/Bip' into Bip

Conflicts:
	src/root/Model/Conveyor.java