local
Merge branch 'master' of https://github.com/sburton42/eclipseGitTest

Conflicts:
	eclipseGitProject/src/eclipseGitProject/HelloWorld.java