Push initial changes to the PR211 branch - ADC Channels fixed, TDC channels not fixed - check number of TDC modules
Push changes to the repo for backup purposes - this branch isn't working
Fix some merge errors