Fixed syntax and indentation
Merge branch 'master' of github.com:elliot627/CS2270