Conflicts#6

Open

dhia1999 wants to merge 7 commits intoalxhoff:conflictsfrom

dhia1999:conflicts

Commits on Apr 16, 2020

Engineer no#1's error fixes
alxhoff
committed

Commits on Oct 28, 2022

Engineer no#2's error fixes

alxhoff
authored and
dhia1999
committed
State machine not building, fixed.

alxhoff
authored and
dhia1999
committed
README for dealing with merge conflicts

alxhoff
authored and
dhia1999
committed

Commits on Nov 3, 2022