fix controller server rmi setup
Merge branch 'master' of https://github.com/dlisuk/cse223b_final_project