tignore
Merge https://github.com/htwg-win/spiel
Merge branch 'master' of https://github.com/htwg-win/spiel

Conflicts:
	.gitignore