Fixed a minor spellng mistake.
Merge branch 'fix-spelling' of https://github.com/kristianroebuck/afraid-to-commit

Conflicts:
	docs/conflicts.rst