more or less back to where I was before the conflict
-rw-r--r-- 130 .gitignore
-rw-r--r-- 267 Makefile
-rw-r--r-- 123 gafrc
-rw-r--r-- 2693 offboard.sch
-rw-r--r-- 127527 telelcotwo.pcb
-rw-r--r-- 38228 telelcotwo.sch