Changes, changes, changes...
Merge branch 'master' of https://github.com/xiecheng59/cs123_final
ALL THE CHANGES