test conflit
Merge branch 'master' into testsma

Conflicts:
	afone.md