commiting everything

there's no turning back now
Merge branch 'master' of https://github.com/syisrael/lb2

Conflicts:
	phase2/i2cmastertest.c
	phase2/usart.c