latest version from laptop
Merge branch 'master' of https://github.com/orchidproject/Location-game-orchid

Conflicts:
	JAAMAS/atomicorchid.tex
	JAAMAS/components.tex