change
Merge remote-tracking branch 'origin/master'

Conflicts:
	SolidWorks 2-22-14/Thumbs.db