Merge pull request #15 from blabno/exercise2

npm test misconfigured #13
Grunt karma #12