Is this what you meant by #169 ?
Merge remote-tracking branch 'origin/master'

Conflicts:
	LegendaryClient/GameScouter.xaml.cs