Avoid warning from trace macro
Fix strange Makefile behaviour
Merge branch 'master' of github.com:dominicgs/usb-mitm

Conflicts:
	Makefile
	TRACE.h
	usb-mitm.cpp