Added normal attack and power attack cooldowns
The node that changes with each tree now uses the correct tooltip
Merge branch 'Version1' into Michael

Conflicts:
	unity/Assets/Prefabs/PlayerUpdate.prefab
	unity/Assets/scripts/HUD.cs