Update package.json for jasmine framework and list of contributors
Update package.json for jasmine framework and list of contributors
merge conflict in .gitignore
Merge pull request #16 from johnheroy/master

Update package.json for jasmine and list of contributors