copied stuff back to java for RMI
Merge branch 'master' of https://github.com/mattydoincode/PLT