Fixing some formatting
Merge branch 'master' of github.com:ChrisSandison/csc373