new file:   myLibrary/data.db
	new file:   myLibrary/library/__init__.py
	new file:   myLibrary/library/__init__.pyc
	new file:   myLibrary/library/admin.py
	new file:   myLibrary/library/admin.pyc
	new file:   myLibrary/library/models.py
	new file:   myLibrary/library/models.pyc
	new file:   myLibrary/library/tests.py
	new file:   myLibrary/library/upload/lutz_large.jpg
	modified:   practice_1/ip_resolver_search.py
	modified:   practice_1/ip_resolver_write.py
	modified:   practice_1/leap_year.py
	modified:   practice_1/month.py
	modified:   practice_2/ip_resolver_search.py
	modified:   practice_2/ip_resolver_write.py
	modified:   practice_2/leap_year.py
	modified:   practice_2/month.py
	modified:   practice_3/testPj/lister/tests.py
	modified:   practice_4/myLibrary/myLibrary/settings.py
	modified:   practice_5/myLibrary/myLibrary/settings.py
message
5
	удалён:    practice_4/myLibrary/.idea/.name
	удалён:    practice_4/myLibrary/.idea/dataSources.ids
	удалён:    practice_4/myLibrary/.idea/dataSources.xml
	удалён:    practice_4/myLibrary/.idea/encodings.xml
	удалён:    practice_4/myLibrary/.idea/misc.xml
	удалён:    practice_4/myLibrary/.idea/modules.xml
	удалён:    practice_4/myLibrary/.idea/myLibrary.iml
	удалён:    practice_4/myLibrary/.idea/scopes/scope_settings.xml
	удалён:    practice_4/myLibrary/.idea/vcs.xml
	удалён:    practice_4/myLibrary/.idea/workspace.xml
	удалён:    practice_5/.idea/dataSources.ids
	удалён:    practice_5/.idea/dataSources.xml
	удалён:    practice_5/.idea/encodings.xml
	удалён:    practice_5/.idea/misc.xml
	удалён:    practice_5/.idea/modules.xml
	удалён:    practice_5/.idea/practice_5.iml
	удалён:    practice_5/.idea/scopes/scope_settings.xml
	удалён:    practice_5/.idea/vagrant.xml
	удалён:    practice_5/.idea/vcs.xml
	удалён:    practice_5/.idea/workspace.xml
	удалён:    practice_5/myLibrary/.idea/.name
	удалён:    practice_5/myLibrary/.idea/dataSources.ids
	удалён:    practice_5/myLibrary/.idea/dataSources.xml
	удалён:    practice_5/myLibrary/.idea/encodings.xml
	удалён:    practice_5/myLibrary/.idea/misc.xml
	удалён:    practice_5/myLibrary/.idea/modules.xml
	удалён:    practice_5/myLibrary/.idea/myLibrary.iml
	удалён:    practice_5/myLibrary/.idea/scopes/scope_settings.xml
	удалён:    practice_5/myLibrary/.idea/vcs.xml
	удалён:    practice_5/myLibrary/.idea/workspace.xml

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	.gitignore
a
	удалён:    practice_5/myLibrary/data.db.old
	изменён:   practice_4/myLibrary/myLibrary/settings.py
Merge branch 'homework_5' of https://github.com/paul-maleev/practice into homework_4

Conflicts:
	practice_4/myLibrary/library/models.py