added description of the java parts
Merge branch 'master' of github.com:robert-schmidtke/map

Conflicts:
	exercise-3/report/assignment-3.tex