test
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/documentation/2014-10-30-documentation.md