Update changelog
Common cold now lowers body temperature
Commented out body temperature equalization code; it was not working correctly
Merge branch 'master' of github.com:Shoes01/Cataclysm-DDA
WIP bodytemp equalization
Bodyheat now tied to hp
Rate of heat loss increases for torso/head, and if in water/sewage
Merge remote-tracking branch 'upstream/master'
Fixed body temperature equalization, cleaned up code
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA

Conflicts:
	data/changelog.txt
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed body temp not warming up. Cleaned up.
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA

Conflicts:
	player.cpp
Remaining hp affects body temp. Fixed bio_climate name
Encum screen now colors warmth values for body parts if they are adequate
Minor frostbite fix regarding pain
Update changelog