Initial version.
Updates 1
Removed Test2
my new file
renamed
Rename
new2 renamed
Renamed.
Cleanup
New2
New1 - new line
new
new folder
mine
Merging
my branch changes
master changes
Merge branch 'bNEW2'

Conflicts:
	NEW2
NEW2 branch
Mastering again