more java doc add in
Merge branch 'master' of https://github.com/CMPUT301W14T11/Team11Prototype
add doc
test
pullMerge branch 'master' of https://github.com/CMPUT301W14T11/Team11Prototype