Update changelog.md
Merge remote-tracking branch 'upstream/master'
Merge pull request #36 from shawnjohnson/master

Update changelog.md