Remove node_modules and Fix initial conflict
Readd Gruntfile.js
Readd package.json