Fixing checkstyle (and other) errors.
Merge branch 'master' of https://github.com/l3370x/byu-340-hit.git
Fixing checkstyle (and other) errors.