Starting some checkstyle fixes. Be weary of it
Merge branch 'master' of https://github.com/dannygoodman210/SLogoTeam1