Create README.md
Merge branch 'master' of github.com:h5p/h5p-image

Conflicts:
	README.md
Merge github.com:h5p/h5p-image into api-1.2
Updated texts
Merge branch 'master' into api-1.1

Conflicts:
	library.json
Merge branch 'api-1.1' into api-1.2