Fixed merge-conflicts and updated extended adcinit

Conflicts:
	src/adc.c
	src/test_adc.c
	src/test_runner.c