Merge branch 'master' of https://github.com/Epix37/Hearthstone-Deck-Tracker

Conflicts:
	Hearthstone Deck Tracker/MainWindow.xaml.cs