./..
Merge branch 'master' of https://github.com/lanctot/iioos

Conflicts:
	iioos.tex
Merge branch 'master' of https://github.com/lanctot/iioos
....