fixed formatting issues
Merge branch 'master' of https://github.com/veezbo/caltech.cs171