Changed hello world string
modified branch in hope that jenkins will automerge master to feature branch
Revert "modified branch in hope that jenkins will automerge master to feature branch"

This reverts commit b2788d7cd6c73f0a90428d51af1bc466bcc0885e.
Merge branch 'master' into ci-test-feature-branch-1

* master:
  Revert "modified branch in hope that jenkins will automerge master to feature branch"
  modified branch in hope that jenkins will automerge master to feature branch
  Changed hello world string

Conflicts:
	helloWorld/src/main/java/sullivan/gareth/App.java
	helloWorld/src/test/java/sullivan/gareth/AppTest.java