Resolved some conflicts
Added grunt and package.json
Updates