asdasdsadsad
Merge branch 'master' of https://github.com/adrianfoo/testing.git

Conflicts:
	src/jenkinsTest/StringAdd.java