file hierarchy fix
Merge branch 'master' of github.com:mikehhawley/fathership-vision

Conflicts:
	makefile
	master.c
	samples.c
	samples/maker.c
	samples/samples.c
	testing/images.c
	testing/testing_images.c
	testing/testing_videos.c
	testing/videos.c
	testing_images.c
	testing_videos.c
	vision.h