Merge branch 'master' of https://github.com/davidjbradshaw/iframe-resizer

Conflicts:
	README.md
Merge branch 'master' of https://github.com/davidjbradshaw/iframe-resizer

Conflicts:
	README.md