Merge branch 'master' of github.com:mitermayer/shortcut-untangler

Conflicts:
	README.md