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