d
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaScript/week02_InnerHTML/project2/galleryWizard.js