Merge pull request #72 from mcpike/master

fixed merge conflict
add a watch task to karma