Merge branch 'gh-pages'
Added favicon in png