en masse
Merge branch 'master' of https://github.com/TheMrCaira/FjordagerTaekwando

Conflicts:
	GUI/MainWindow.xaml.cs