Merge !2
authorDan Allen <dan.j.allen@gmail.com>
Sat, 7 Oct 2017 23:10:37 +0000 (23:10 +0000)
committerDan Allen <dan.j.allen@gmail.com>
Sat, 7 Oct 2017 23:10:37 +0000 (23:10 +0000)
resolves #2 enforce coding style rules


Trivial merge