temp
basic server structure
temp
merge errors fixed
Merge branch 'master' of https://github.com/arjpuriCMU/RMI into karan
changed marshall message names