комит
Merge remote-tracking branch 'origin/master'

Conflicts:

	TeamProjectTetris/TeamProjectTetris/obj/Debug/TeamProjectTetris_MarkupCompile.i.cache