Gruntfile.js
Merge branch 'master' of github.com:dianadujing/testing

* 'master' of github.com:dianadujing/testing:
  Initial commit
.gitignore
package.json
.gitignore
.gitignore