updates
Merge branch 'master' of http://github.com/vortex314/projects

Conflicts:
	StellarisUart/src/Uart.cpp