working maybe?

maybe
Merge branch 'master' of https://github.com/Calder/Bleep

Conflicts:
	serial.c
	serial.h
	serial_test