SECOND COMMIT KO
Merge branch 'jj_branch' of https://github.com/hadrianang/CS123-Exercise into test1