Merge pull request #17 from blabno/exercise4

npm test misconfigured #13
Grunt karma #12