first commit
Merge branch 'master' of https://github.com/press0/diff

first merge
cleanup