upd
Merge branch 'master' of https://github.com/vortex314/projects

Conflicts:
	StellarisUart/src/Uart.h
Merge branch 'master' of https://github.com/vortex314/projects
upd