add this is codingeverybody2
resolved comflict helloworld.html