Test system completed with amendation
Change 1
Change 2
Another change
Merge remote-tracking branch 'github/master'

Conflicts:
	src/test_git2/Test.java