Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Moved bodytemp code to player.cpp and uncommented update_bodytemp
Long underwear no longer have storage
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Merge pull request #212 from Shoes01/master

Bodytemp code moved to player.cpp