formatting clean up
Merge branch 'master' of https://github.com/calcu16/cs182d
recompile after merge