Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Wake up if infected wound gets worse, dont just die while sleeping.
Merge branch 'master' of https://github.com/OzoneH3/Cataclysm-DDA
Main Menu fix for windows, clear all lines before drawing menu
Merge pull request #163 from OzoneH3/master

Main Menu fix for windows, clear all lines before drawing menu