kevin
Merge branch 'master' of github.com:land-/javatraining

Conflicts:
	README.md