Added some stuff to the changelog
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA