level1

level1
Fixing Conflicts
Fixing Conflics

Conflicts:
	Assets/Code/HUD.cs
	Assets/Code/UpgradeStation.cs
	Assets/Code/playButton.cs
	Assets/Scenes/Level1.unity
	Assets/Scenes/NikolajTestLevel.unity
Merge branch 'master' of https://github.com/TheFracker/Wrahh

Conflicts:
	Assets/Code/UpgradeStation.cs