Merge pull request #284 from gwitmond/master

Added favicon
Merge pull request #285 from gwitmond/master

Made image placeholders back to their colors from the annotation.
Updated favicon to something more beautiful. (mine)