vim: set encoding utf8
vim: replace inendLine with indentGuide
Merge branch 'master' into ubuntu