Merge branch 'master' of https://github.com/suu----/avr

Conflicts:
	ADC/firmware/main.c
ありがとうございます

あ