Poole
Merge remote-tracking branch 'origin/master'

Conflicts:
	article/artideas.md