Header modified from homepage to projectname
Hello world
Made changes with basefile.txt
Merge branch 'issue1' into issue2
Made changes in basefile.txt to Hi World
Resolve conflict of h1