Healthbar and health scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/scene1.unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/scene1.unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/scene1.unity