Merge branch 'master' of https://github.com/nailliK/gruntastic-project-starter