Some work on FSM for conveyor 1 still not perfect
Merge branch 'develop' of https://github.com/Hamdor/SE2-2.3 into develop