Testttttinggg (commit on 'test branch')
More features, lol
bug fix
merge conflict resolved
Merge branch 'master' of github.com:velidar/testRepo