Merge remote-tracking branch 'original-repo/master'
com
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'original-repo/develop' into develop
practice_8_1
practice_8_2
practice_8_2
Merge branch 'practice_8_2' into develop
hw_8
Merge remote-tracking branch 'origin/develop' into develop
hw_8
changes in hw_7
ddd
Merge branch 'smth2' into develop

Conflicts:
	.settings/org.eclipse.core.resources.prefs
Merge remote-tracking branch 'original-repo/develop' into develop

Conflicts:
	olga/console_tests.py
practice 9
practice_9_2
Ignore eclipse files.