npm, grunt and test
merge