reading test images
Merge remote-tracking branch 'origin/hdr-image' into hdr-image

Conflicts:
	src/main.cpp