a
Merge branch 'master' of https://github.com/umb-kdlab/deepnet

Conflicts:
	src/imagedataset.py