Added a new comment, using the main eclipse workspace and a separate
branch.
Added a comment in a copy of the repo, in a new branch
Merge branch 'paulTest' into otherTest

This combined two sets of comments

Conflicts:
	testArduino/testArduino.cpp