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

Conflicts:
	a.txt