Some description

describing what i've done
Merge remote-tracking branch 'origin/master'

Conflicts:
	img.bat