merge doof into statemachineshooter #77

Closed cannedlock closed 4 years ago