testing the readme with js
More features, lol
bug fix
merge conflict resolved
Merge branch 'master' of github.com:velidar/testRepo
changes
more features
master branch bug fix
Successfully merged lOL branch with the new 'features'
new change
added more
merge success
another commit
merge with ext tool fail
conlfict resolved
cleaning house
commiting...
changes
conflict resolved