ignore this
Merge branch 'master' of https://github.com/fnothaft/ampx-docs

Conflicts:
	latex/avocado-proposal/avocado-proposal.log