bug1
add project2
bug2
delete bug1
bug1
Merge branch 'bug'

Conflicts:
	test.txt