git ignore sources
Merge branch 'master' of https://github.com/bedita/bedita
Merge remote branch 'origin/master'