more formatting fixes
Merge branch 'master' of https://github.com/sexypirate604/cs410