[develop] add a.o
Merge branch 'develop'

Conflicts:
	a.txt