delete #1
delete #2
Merge branch 'master' into asbubam

Conflicts:
	b.txt