spelling
Merge commit 'aaaefc2'

Conflicts:
	main.py