launcher 1/3
Merge branch 'master' of https://github.com/CostardRouge/ShootEmUpMaker

Conflicts:
	ShootEmUpMaker/ShootEmUpMaker/MakerWindow.xaml