continue work on the Health Bar
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/a8/a89d154a75b24ca45b933b853f06b4b8