add favicon.ico
Merge branch 'chamnap'

merge master with my branch