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

Conflicts:
	FilmsGitProject/src/C.java