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

Conflicts:
	StellarisUsb/src/BipBuffer.cpp
	StellarisUsb/src/BipBuffer.h