Remove merge conflicts
Merge branch 'master' of github.com:dominicgs/usb-mitm

Conflicts:
	Makefile