trying a commit from normal user
Merge branch 'master' of https://github.com/SiminaTofan/TestGitRepository

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