[FIX] Whitespace and indentation, add merge tool = diffmerge
Add global config for diffmerge to gitconfig
Update .gitconfig with difftool and mergetool from diffmerge website
Add link to Root_London_Public/Marcin