nothing
Revert "nothing"

This reverts commit 8e6f4646ed2b4a1bbfcbda6485b45823a3b77b68.
Small changes
Merge branch 'master' of https://github.com/CostardRouge/ShootEmUpMaker

Conflicts:
	ShootEmUpMaker/ShootEmUpMaker/WelcomeWindow.xaml.cs