commiting
Deleteing many files
deleting
Making some arbitary changes
Adding
Comitting file2
Commiting in changes1
Test
Merge branch 'changes'
Merge branch 'changes1'
Comitting all
Merge branch 'change'

Conflicts:
	dir1/file2InDir1.txt
Merge branch 'master' of https://github.com/nyalooo/test-repo-oh-octo