Première version
Merge branch 'master' of github.com:mpattyn/rpg

Conflicts:
	bibliographie/bibliographieST.tex