Last Javadocs I should have to make!!! wootwoot!
Merge branch 'master' of https://github.com/Team-CMPUT301F13T12/301-Project