My Checkin
Merge remote-tracking branch 'origin/master'

Conflicts:
	design/Hope for the Holidays-Home.psd