Improved SwapKeepers, repaired DeckParser (sorry about that)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/DeckParser.cc
	src/GameLoop.cc