Added energy script (without acceptable visual)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Models/Materials/Box01Mat.mat.meta
	Assets/Models/hovercraft_02.obj.meta
	Assets/Scenes/testingScene.unity