Merge branch 'master' of https://github.com/myplanetdigital/myplanetdigital-content

Conflicts:
	documents/article/our-approach.html.md