Changes to delay.c and .h

Removed functions from .h and made functions to static in .c.
Fixed conflicts in main.c
Merge remote-tracking branch 'origin/integration' into arduino_pin_mapping