-
Merge remote-tracking branch 'origin/bootloader' into bootloader

Conflicts:
	bin/avr.dump
	bin/avr.elf
	bin/avr.hex
	bin/avr.map
	src/main.o