Merge pull request #1 from jimAScott/JSBranch

Adding a nice comment in the branch
This is some changes int he master
Merge branch 'master' into JSBranch
A commit to foce a conflict
Som,ething to see if there is a merge issue
Merge branch 'master' into JSBranch
Somthing merged
Conflicts:
	Some new files/ReadMe.txt