merge changelog.txt
move docs/credits.txt -> credits.txt