Favicon (img folder placeholder)
Merge remote-tracking branch 'upstream/master'