Correct merging implemented
Merge branch 'master' of https://github.com/guija/sublime_vergleich