More updates, more randomness, more TOOOOORNAAADDO!!!
Merge branch 'master' of https://github.com/xiecheng59/cs123_final

Merging changes...