add changes...
Merge branch 'master' of https://github.com/Justkant/ADC

Conflicts:
	src/main.cpp