Updated favicon, color blocks and apple touch icon
Holiday options, halloween enabled
Merge branch 'master' of https://github.com/lynnwallenstein/lynnwallenstein.github.io

Conflicts:
	css/15ff.main.css