test
Merge branch 'master' of https://github.com/phoenix747/data-porter

Conflicts:
	src/data_porters/core.clj
	src/data_porters/reader.clj
"test"