Trying new diff tool.
Changed greet file.
Change index.html on master.
Used the mergetool.