linted code
Merge branch 'master' of github.com:kevinoconnor7/penelophant