create a read
create a file1
modify file2 &addtodo.txt
create quantum cat
create quantum dog1
create test
modify dog1
create admin1
fixed bug
Merge branch 'admin'
Merge https://github.com/ankit1910/ankit into cat

Conflicts:
	cat.txt
	test.txt