Update .gitignore
Update .gitignore
Merge origin/gael into gael

Conflicts:
	.gitignore
Base du programme
Update .gitignore
Merge origin/dev into dev
Merge origin/gael into gael

Conflicts:
	.gitignore
Base du programme
Merge branch 'gael' of github.com:mbret/jenseits-von-theben into gael
Base du programme ok
Tentaive sans multiples classes
Test delete file
Suppression des classes 'inutiles'
initialisation deck terminee
Merge origin/master

Conflicts:
	manifest.mf
Initialisation des jetons dans les areas terminée
Merge origin/dev into dev
Merge origin/master

Conflicts:
	manifest.mf
1ere version de la base
Merge origin/dev into dev