fix gitignore
update logo url
Merge branch 'master' into gh-pages