Merge pull request #1 from atmmarketing/development

Update gruntfile.js with custom foundation
Merge branch 'development'
Update Gruntfile.js
Merge branch 'master' into development