branch hello world value changed
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
Merge commit '08d642f0b1b2a6b51e0e5b08c1e0f58e190b8c17' into HEAD
hello world string declared as a constant
Merge pull request #1 from sinsir/ci-test-feature-branch-2

Ci test feature branch 2