Better explanation of watermarks and text overlays in the README, added CHANGELOG
Merge branch 'master' into heroku