add file .DS_Store and folder .idea/ to .gitignore
Merge branch 'master' of https://github.com/chyingp/grunt-inline