minor change
Merge pull request #16 from origin/master#test_pull_before_merge
Updating Changelog