Starting to working on a branch
A new commit
A new new Commit
Merge remote-tracking branch 'origin/simple_branch'

Conflicts:
	TestGit/bin/.gitignore
	TestGit/src/MyMain.java