new changes
new field in Branch
Strange things
Merge remote-tracking branch 'origin/master' into branch

Conflicts:
	FilmsGitProject/src/C.java
Merge branch 'branch' of https://github.com/artefactor/FilmsProject.git
into branch

Conflicts:
	FilmsGitProject/src/C.java