style cop fixes
Merge branch 'developing' of https://github.com/calmajos/CSE136-Project into developing