Added lines
Added a new test.js file
Resolved conflict
Merge pull request #2 from kodekwality/testingbranch

Testingbranch