V2
V3
V4
Merge remote-tracking branch 'origin/master'

Conflicts:
	Thumbs.db