Fixed/added header include guards in digital.h and thorax_time.h.
Renamed files digital.h/c to thorax_digital.h/c to avoid future name collisions.
Fixed some merging issues