filled out changelog
Merge pull request #258 from SamPatt/master

filled out changelog