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

Conflicts:
	usb/main.cpp