Created favicons and code for adding them to site, moved grumpy-cat.txt for ASCII to graphics folder
push to remote after fixing local merge conflicts