removed duplicate file
Merge pull request #67 from mcpike/master

removed duplicate file
Merge branch 'master' of https://github.com/Green-Snake-Platinum-Kangaroo/Green-Snake-Platinum-Kangaroo
updated grunt tasks
Merge pull request #68 from mcpike/master

updated grunt tasks
resolve conflict
Merge branch 'master' of https://github.com/Green-Snake-Platinum-Kangaroo/Green-Snake-Platinum-Kangaroo