Something, not sure
Merge Conflicts fixed.
Added comments
Merge branch 'master' of https://github.com/lunyx/cs640_proj4
Started work on todo statements. Still a WIP.