changelog 1.2
changelog 1.2 fixes
Merge pull request #100 from MariadeAnton/changelog_master

changelog 1.2