Merge pull request #16 from blabno/exercise3

npm test misconfigured #13
Grunt karma #12