started headway on serialization for kyle's database
Merge branch 'master' of https://github.com/biomarkers/vision

Conflicts:
	Makefile