missed a merge conflict on package.json
Merge pull request #37 from kamalama/authentication

missed a merge conflict on package.json