i think we have both changed the same files
Merge branch 'master' of https://github.com/StewartTodhunter/notepad