favicons
wtf windows
Merge remote-tracking branch 'origin/master'

Conflicts:
	favicons/Thumbs.db