Revert "reverse changed1"

This reverts commit bd0ab26b7fbc38b007d62425b951bbf2557fae50.
Revert "Revert "reverse changed1""

This reverts commit d9e2a802a44895a625f0e893902be3c256f26587.
changed1
commit changed3
Create newfile
add changed2
add new file
Merge branch 'master' of https://github.com/fcsteagu/test

Conflicts:
	README.md
Create secondfile
add changed3
Merge branch 'master' of https://github.com/fcsteagu/test
Update newfile
stashed resolved
ignore dontTrack.txt
ignore dontTrack folder
Update secondfile
Delete newfile
Create secondfile
add changed3
Update newfile