Merge branch 'develop' into BrandonSprint11
added cooldown timer to cooldownbar
Merge pull request #120 from jackykschou/BrandonSprint11

Brandon sprint11