commit
Merge branch 'master' of https://github.com/Johangsl/Shoot-Em-Up

Conflicts:
	Library/CurrentLayout.dwlt