gruntfile edits
travis button
Merge pull request #3 from makakoa/dev_branch

gruntfile edits