add grunt, change .gitignore
Merge branch 'feature-grunt'