file change:D
Merge branch 'master' of https://github.com/Apocalype/Lab7github

Conflicts:
	complete_code.py