Re-Fixed cooldowns
Merge pull request #99 from ampayne2/master

Re-Fixed cooldowns