Javadoc for new code
Merge branch 'master' of https://github.com/jwoo12/CMPUT301W13T08.git