added changelog
Merge branch 'master' into changelog
added changelog
Merge pull request #4 from jlambert121/changelog

Changelog