added favicon.ico

fixes #285
Merge branch 'master' into issue-285-favicon

Conflicts:
	.gitignore
Merge pull request #300 from theodi/issue-285-favicon

added favicon.ico