testing the readme with js
bug fix
merge conflict resolved
Merge branch 'master' of github.com:velidar/testRepo
changes