more
Merge branch 'master' of github.com:AlexandreAbraham/frontiers2013

Conflicts:
	frontiers.tex