//
///

Conflicts:
	Classes/LayerDeckEditor.cpp
	Resources/cards.cdb