Commit to test merge tool
Merge branch 'master' of https://github.com/HofmaDresu/VimConfigs