change directory name
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/test_image.jpg