Fix typos
Merge branch 'master' of github.com:skwashd/repo

Conflicts:
	new-file.txt