Resolve difference with upstream
Merge branch 'master' of https://github.com/anonymous555/Hearthstone-Deck-Tracker

Conflicts:
	Hearthstone Deck Tracker/Hearthstone/Card.cs