First
karma
added node_modules to gitignore
created index
fix merge conflicts