Latest sync

Keep as 5x Health and 1x life
Merge branch 'master' of https://github.com/JordanLingHua/cs113Project

Conflicts:
	cs113Project/Assets/Scene1.unity