add grunt-karma to devDependencies
add karma task to Gruntfile
merge conflicted resolved
fixed typo in package.json
Merge pull request #72 from mcpike/master

fixed merge conflict