guygrigsby/Thing42 — pull request #12 by trevorsmith86 (2014-09-06 20:03:59+00:00)
Title: Contains Robert's checkstyle changes

Reserved merge conflicts for Robert's merge.