Committing the reformatting of these two files so IntelliJ will leave me the hell alone
Merge pull request #17 from labriola/develop

Committing the reformatting of these two files so IntelliJ will leave me...