Many changes
Merge branch 'master' of https://github.com/oliverwkim/cs51-project