Linted
Merge pull request #3 from andywillis/master

Linted