More changes
Merge branch 'master' of https://github.com/Slashthedragon/PythonLearning

Conflicts:
	PythonLearningNotes.ods