added favicon
favicon added
added TODO file
fixed merge conflict