// links
Merge branch 'master' of https://github.com/algolia/AlgoliaFAQ

Conflicts:
	_includes/header.html
	_layouts/default.html
	index.html