clean repo
New Start
Merge branches 'master' and 'master' of https://github.com/jensbt/VESTERBRONX-SPACESHOOTER

Conflicts:
	Assets/Materials/Stone.mat
	Assets/Prefab/projectiles/needle.prefab
	EasyWebCamAR-master/Assets/Model/Enghave.fbm/UVEnghave.jpg.meta
	EasyWebCamAR-master/Assets/Model/Enghave.fbx
	EasyWebCamAR-master/Assets/Model/Enghave.fbx.meta
	EasyWebCamAR-master/Assets/Resources/Interface/CannonShop.meta
	EasyWebCamAR-master/Assets/Resources/Interface/CannonShop/Back button.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/HangerScreen.meta
	EasyWebCamAR-master/Assets/Resources/Interface/HangerScreen/Back button.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/HangerScreen/Gun Mount.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/HangerScreen/Switch Ship_.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/MainMenu.meta
	EasyWebCamAR-master/Assets/Resources/Interface/MainMenu/Cannon Shop Button.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/MainMenu/Hangar button.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/MainMenu/Mission Level button.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/MainMenu/Ship Shop button.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/MissionLevelScreen.meta~Updated upstream
	EasyWebCamAR-master/Assets/Resources/Interface/MissionLevelScreen/Back button.png.meta
	EasyWebCamAR-master/Assets/Resources/Interface/ShipShop.meta
	EasyWebCamAR-master/Assets/Resources/Interface/ShipShop/Back button.png.meta