Added conten of doc/index.html
conflicts resolved