@overrides
more dishes
Fix merge conflicts
Merge pull request #12 from trevorsmith86/master

Contains Robert's checkstyle changes