Small changes

Modified the delay-function, is now accurate.
Changed names on delay-functions and removed test-files. All tests are
now in separate txt-file.
Removed delay-code from main.c
Fixed merge conflicts in main.c