commit for local branch A
another comit on branch A
another commit from simmulated user
Merge branch 'BranchA' of https://github.com/SiminaTofan/TestGitRepository into BranchA

Conflicts:
	src/main/java/playground/App.java