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

Conflicts:
	SQLite/game.sqlite