Fixed various issues prompted in console
Merge branch 'master' of https://github.com/brendonwai/Time-game

Conflicts:
	TimeGame/Assets/Scenes/TG - Level 0.unity
	TimeGame/Assets/Sprites/Enemy/health drone.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Death.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Death/HealthDroneDeath1.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Death/HealthDroneDeath2.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Death/HealthDroneDeath3.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Death/HealthDroneDeath4.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked1.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked10.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked11.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked12.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked13.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked14.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked2.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked3.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked4.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked5.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked6.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked7.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked8.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Hacked/HealthDroneHacked9.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Walk.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Walk/HealthDrone1.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Walk/HealthDrone2.png.meta
	TimeGame/Assets/Sprites/Enemy/health drone/Walk/HealthDrone3.png.meta
Fixed merge conflict