Fixed a few loading problems
Merge branch 'master' of https://github.com/yeshaouyang/cis196-hw6