some style fixes
Merge branch 'master' of https://github.com/deannazhu514/237-hw4
fixes and stuffs and victory!
aslkfj