Scales fit and weapons should be as they should
Merge branch 'master' of https://github.com/jensbt/VESTERBRONX-SPACESHOOTER

Conflicts:
	Assets/Scripts/GameLevels/Level_Two.cs