Fixed conflicts to merge
Added favicon
Merge pull request #16 from thadley/favicon

Favicon