add test.txt from dev
add testsubfolder from dev branch
Merge branch 'master' of https://github.com/overcomer/scalagit into dev
test