here is another comment from a nice interface
Another nice change
A nice commit and that
Merge branch 'master' into JSBranch
A commit to foce a conflict
Merge branch 'master' into JSBranch
Somthing merged
Conflicts:
	Some new files/ReadMe.txt
Merge pull request #2 from jimAScott/JSBranch

A pull request