Update
Merge branch 'master' of https://github.com/hackhowtofaq/xxdiff

Conflicts:
	README.md