add ggugurigithub2
resolved conflict helloworld.html