favicon
Merge branch 'master' into steph
Merge pull request #31 from ahsterling/steph

Steph