Update
Merge branch 'master' of https://github.com/rgruener/threadedJavaJourney

Conflicts:
	pom.xml