Merge pull request #17 from danielfoord/dev

Update Master
added grunt to master
updated ignore
Merge pull request #18 from danielfoord/master

Master