update
Merge branch 'test'

Conflicts:
	appendix/a4_resource.md