YJ- done I think!
Merge branch 'master' of https://github.com/chcokr/cs61bl-proj3.git
YJ- updating javadoc