added favicon
Merge branch 'DavidBranch'