latest version of java files
Merge branch 'master' of https://github.com/AngryFaces/Sidannarverkefni