test commit
gg
Merge remote-tracking branch 'origin/master'

Conflicts:
	practice_1/ivan.py