fixed tabs
Merge branch 'master' of github.com:megkatjo/cs118
comments and shit
comments and shit