C
Readded devtypes.h
Readded files which mysteriously disappeared
Merge branch 'alternate'

Conflicts:
	client/Rules.make
	client/main.c
	client/src/devtypes.h
	client/src/devtypes.h~
	client/src/usb-operations.c
Refactored. Didn't break it this time!