node modules added
js folder with app.js and main.js file
added mocha/chai testing
grunt files
fixed merge conflict