Added template hacks to make static deck definitions easier
Merge remote-tracking branch 'origin/master'

Conflicts:
	mtgsim/src/AI/trogdor_ai.cpp