Java+2

Signed-off-by: Wim Tibackx <wim.tibackx@student.kdg.be>
Merge branch 'master' of github.com:Jasera/SoftwareDevelopment

X