changelog
Merge remote-tracking branch 'origin/master'

Conflicts:
	YGOProDeckConverter/bin/Debug/cards.cdb