merge problem
Merge branch 'master' of https://github.com/klangner/bluenotepad.git