Merge pull request #3 from banj/master

config, favicon