added javadoc for milestone 3
Merge branch 'master' of github.com:IEOR140-T5/FinalProject