Fix #34

This is @mcallahan's patch mentioned in #35.
Merge branch 'master' of https://github.com/arxanas/Cockatrice

Conflicts:
	cockatrice/src/deck_loader.cpp