Flipping features now a flag
Merge branch 'master' of pjreddie.com:jnet

Conflicts:
	src/tests.c
Old feature extraction method
New feature extraction method
Better alternating between video cards
GPU flag in Makefile