Add branch
Add Master content
Merge branch 'MyBranch'

Conflicts:
	Eclipse-Github-Test/src/github/test/Test.java