Create README.md
Update README.md
added ... to Main.java
Merge branch 'another-branch'
change 1 to another-branch
Merge branch 'master' into another-branch

Conflicts:
	src/foo/Main.java
change 3 to another-branch
Merge branch 'master' into yet-another-branch