add test.txt again
remove the mastertest.txt file
Merge branch 'dev'
new version of test.txt
modified
conflict testing
conflict testing
conflict resolved, merge master and dev
fast forward testing
fast forward testing
Merge branch 'master' into dev
fastforward teting
changed all files into a folder