Merge pull request #6 from bparrish206/dev

Dev
adding gruntfile
Merge pull request #7 from bparrish206/master

Updates