Starting to add my edits as per email
Merge branch 'master' of https://github.com/orchidproject/Location-game-orchid

Conflicts:
	JAAMAS/evaluation.tex