Added lazycat's suggestions
Merge branch 'win-animation' of https://github.com/fergus-dall/Cataclysm-DDA into fergus-dall-win-animation

Conflicts:
	crafting.cpp

Whatever