commin in local branch master2
local commint after branch
Merge branch 'master' of https://github.com/artefactor/FilmsProject.git
into master2

Conflicts:
	FilmsGitProject/src/C.java