Formatting, documentation
Merge branch 'master' of github.com:wayetender/rmiprojgroup4