add favicon, shouldn't really be here but easiest way to send it to naomi without crashing the disk yet again :D
merge conflicts