testing this branch
loaded a favicon
Merge branch 'master' into chuphay
Merge branch 'chuphay'