green-fly.JPG
Merge remote-tracking branch 'origin/master'

Conflicts:
	img/gallery/macro/green-fly.jpg