conflict
for testdata
Merge branch 'master' of https://github.com/uchihashikenshi/CNNforEM

Conflicts:
	create_dataset.py