Merge branch 'master' of https://github.com/OzoneH3/Cataclysm-DDA
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Added hit animation. Z/Player/Npcs flash with a red background when hit.