just added some comments, heading to Sam's, will add more later
Merge branch 'master' of https://github.com/haocow/cs118-project2