Merge pull request #19 from blabno/exercise6

npm test misconfigured #13
Grunt karma #12