Update changelog.txt
Uodated changelog.
Merge branch 'master' of https://github.com/weikanglim/colloid-polymer-osp-simulation
Merge branch 'master' of https://github.com/weikanglim/colloid-polymer-osp-simulation into dev2