added grunt tests
edit gitignore
resolved merge changes
Merge pull request #5 from makakoa/dev_branch

added grunt tests