favicon issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	README
Merge branch 'master' of https://github.com/AdamArmstead/AdamArmstead.github.io