updated on missing content

Signed-off-by: Adam McNicol <adam@mcnicol.me>
Merge branch 'master' of https://github.com/pythonschool/pythonschool.github.io

Signed-off-by: Adam McNicol <adam@mcnicol.me>

Conflicts:
	data-structures-algorithms/algorithms-and-data-structures/index.html
	data-structures-algorithms/binary-search/index.html
	data-structures-algorithms/binary-tree/index.html
	data-structures-algorithms/bubble-sort/index.html
	data-structures-algorithms/code/binary_tree.py
	data-structures-algorithms/code/insertion_sort.py
	data-structures-algorithms/code/linked_list.py
	data-structures-algorithms/code/quick_sort.py
	data-structures-algorithms/images/graphOne.jpg
	data-structures-algorithms/images/linkedListOne.jpg
	data-structures-algorithms/images/linkedListTwo.jpg
	data-structures-algorithms/images/queue.jpg
	data-structures-algorithms/images/sort.jpg
	data-structures-algorithms/images/stack.jpg
	data-structures-algorithms/images/tree.jpg
	data-structures-algorithms/implementing-the-stack-class-using-oop/index.html
	data-structures-algorithms/insertion-sort/index.html
	data-structures-algorithms/linear-search/index.html
	data-structures-algorithms/linked-lists/index.html
	data-structures-algorithms/queues/index.html
	data-structures-algorithms/quicksort/index.html
	data-structures-algorithms/stacks/index.html
	oop/adding-methods-to-our-class/index.html
	oop/animals-practice-task/index.html
	oop/animation/classattributes_Resources/HYPE.js
	oop/animation/classattributes_Resources/PIE.htc
	oop/animation/classattributes_Resources/barcode.png
	oop/animation/classattributes_Resources/classattributes_hype_generated_script.js
	oop/animation/encapsulation_animation_Resources/HYPE.js
	oop/animation/encapsulation_animation_Resources/PIE.htc
	oop/animation/encapsulation_animation_Resources/encapsulationanimation_hype_generated_script.js
	oop/animation/farm_Resources/HYPE.js
	oop/animation/farm_Resources/PIE.htc
	oop/animation/farm_Resources/crop.png
	oop/animation/farm_Resources/farm_hype_generated_script.js
	oop/animation/farm_Resources/field.png
	oop/animation/farm_Resources/sheep.png
	oop/animation/self_Resources/HYPE.js
	oop/animation/self_Resources/PIE.htc
	oop/animation/self_Resources/self_hype_generated_script.js
	oop/creating-your-first-class/index.html
	oop/field-management/index.html
	oop/further-field-methods/index.html
	oop/images/animal_class_inheritance_diagram.graffle
	oop/images/animal_class_inheritance_diagram.png
	oop/images/crop_class_diagram.graffle
	oop/images/crop_class_diagram.png
	oop/images/crop_class_diagram_methods.graffle
	oop/images/crop_class_diagram_methods.png
	oop/images/crop_class_diagram_methods2.png
	oop/images/crop_class_inheritance_diagram.graffle
	oop/images/crop_class_inheritance_diagram.png
	oop/images/crop_class_management_structure_chart.graffle
	oop/images/crop_class_management_structure_chart.png
	oop/images/crop_class_select_crop_structure_chart.graffle
	oop/images/crop_class_select_crop_structure_chart.png
	oop/images/field_class_diagram.graffle
	oop/images/field_class_diagram.png
	oop/images/field_class_methods_diagram.graffle
	oop/images/field_class_methods_diagram.png
	oop/images/field_class_methods_diagram2.png
	oop/inheritance-and-polymorphism/index.html
	oop/introduction-to-object-oriented-programming/index.html
	oop/representing-fields/index.html
	oop/testing-the-functionality-of-the-class/index.html
	pyqt/adding-growth-functionality/index.html
	pyqt/adding-the-drag-functionality-to-the-toolbar-labels/index.html
	pyqt/adding-the-drop-functionality-to-the-field/index.html
	pyqt/animation/co-ordinates.hype/Thumbnails/0762D09D-C038-4912-88DC-835C3081C1D1-5368-00001ECB9BBC3023.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/41B2C0D8-5B6D-430D-A3AB-CFFBBD1AC7C3-5368-000021C400828C04.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/6B50FEF9-AACF-4F5F-B752-A22DCB8594CD-5368-00001FFB83A3DA9B.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/72C8193A-E1F4-4AAF-A603-F1E4CA4B0C36-5368-00001F981B3EF21B.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/78269595-DD4F-4CD4-9F3B-8D07CE3F765C-5368-000021913869F829.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/7D83ADC1-6FB9-4F55-8E48-5E67ADEF809D-4552-000018F8323B7D3A.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/9BA85C9F-0657-4B7E-B6A8-C11B38166032-4552-0000190CB9D4F1BC.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/ECB98C07-E585-4255-8F40-86ADF47085D6-4552-0000199BFA47A506.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/EE9E78D0-CF24-4D63-8ED8-3C3400600B30-5368-00001F638B88E857.tiff
	pyqt/animation/co-ordinates.hype/Thumbnails/FC34A05F-6A25-4856-9745-7790F0C939D0-4552-0000194BFB76A04C.tiff
	pyqt/animation/co-ordinates.hype/data.plist
	pyqt/animation/coordinates_Resources/HYPE.js
	pyqt/animation/coordinates_Resources/PIE.htc
	pyqt/animation/coordinates_Resources/coordinates_hype_generated_script.js
	pyqt/animation/pyqtgraphics_Resources/709945164_f945e4f475.jpg
	pyqt/animation/pyqtgraphics_Resources/HYPE.js
	pyqt/animation/pyqtgraphics_Resources/PIE.htc
	pyqt/animation/pyqtgraphics_Resources/pyqtgraphics_hype_generated_script.js
	pyqt/animation/pyqtgraphics_Resources/robot.png
	pyqt/automatically-growing-the-field/index.html
	pyqt/context-menus/index.html
	pyqt/creating-a-basic-pyqt-application/index.html
	pyqt/creating-the-layouts/index.html
	pyqt/crop-and-animal-graphical-sub-classes/index.html
	pyqt/designing-the-user-interface/index.html
	pyqt/distributing-your-application-on-mac-os-x/index.html
	pyqt/distributing-your-application-on-windows/index.html
	pyqt/distributing-your-application/index.html
	pyqt/field-report/index.html
	pyqt/field-simulation/index.html
	pyqt/final-summary/index.html
	pyqt/graphical-crop-simulation/index.html
	pyqt/graphical-representation-of-crops-and-animals/index.html
	pyqt/graphical-representation-of-the-field/index.html
	pyqt/graphics-and-resources/index.html
	pyqt/images/animals/cow/baby.png
	pyqt/images/animals/cow/fine.png
	pyqt/images/animals/cow/poor.png
	pyqt/images/animals/cow/prime.png
	pyqt/images/animals/sheep/baby.png
	pyqt/images/animals/sheep/fine.png
	pyqt/images/animals/sheep/poor.png
	pyqt/images/animals/sheep/prime.png
	pyqt/images/cow_mature.png
	pyqt/images/crop_view_class_diagram.png
	pyqt/images/crops/potato/mature.png
	pyqt/images/crops/potato/old.png
	pyqt/images/crops/potato/seed.png
	pyqt/images/crops/potato/seedling.png
	pyqt/images/crops/potato/young.png
	pyqt/images/crops/wheat/mature.png
	pyqt/images/crops/wheat/old.png
	pyqt/images/crops/wheat/seed.png
	pyqt/images/crops/wheat/seedling.png
	pyqt/images/crops/wheat/young.png
	pyqt/images/decoupled_code.png
	pyqt/images/field.png
	pyqt/images/fieldbackground.png
	pyqt/images/fieldsceneclassdiagram.png
	pyqt/images/fielduidesign1.png
	pyqt/images/fielduidesign2.png
	pyqt/images/fielduidesign3.png
	pyqt/images/fielduidesign4.png
	pyqt/images/fielduidesign5.png
	pyqt/images/fielduidesign6.png
	pyqt/images/fieldwindowdiagram.png
	pyqt/images/finalcrop.png
	pyqt/images/finalfield.png
	pyqt/images/graphicsitemclassdiagram.png
	pyqt/images/integrated_code.png
	pyqt/images/mainwindow.png
	pyqt/images/mainwindow_layout.png
	pyqt/images/mainwindow_layout2.png
	pyqt/images/manualgrowdialog.png
	pyqt/images/pyqt_mac.png
	pyqt/images/pyqt_win.png
	pyqt/images/radiobuttons.png
	pyqt/images/radiobuttonwidget.png
	pyqt/images/secondlayout.png
	pyqt/images/secondlayout_grid.png
	pyqt/images/secondlayout_grid2.png
	pyqt/images/uidesign.png
	pyqt/installing-pyqt-on-mac-os-x/index.html
	pyqt/installing-pyqt-on-windows/index.html
	pyqt/introduction-to-event-handling/index.html
	pyqt/introduction-to-layouts/index.html
	pyqt/introduction-to-pyqt/index.html
	pyqt/manually-growing-the-field/index.html
	pyqt/radio-button-widget/index.html
	pyqt/resources-file/index.html
	pyqt/summary/index.html
	pyqt/switching-layouts/index.html
	pyqt/toolbars/index.html
	regular-expressions/files/regex.doc
	regular-expressions/further-regular-expression-syntax/index.html
	regular-expressions/images/example_find_replace.png
	regular-expressions/key-terms/index.html
	regular-expressions/python-and-regular-expressions/index.html
	regular-expressions/regular-expressions-worksheet/index.html
	regular-expressions/regular-expressions/index.html
	regular-expressions/server-side-validation/index.html