java files
Merge pull request #13 from RBirkeland/master

java files