conflicting change
conflicting change
Merge branch 'master' of github.com:RobTaylor76/DummyTest

Conflicts:
	readme
new branch
resolved pull request comments
Merge pull request #1 from RobTaylor76/newbranch

Newbranch