Updated credits
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Updated dumb joke