Linted
Merge pull request #150 from tsherif/linted

Linted