Solve the conflict.
Merge remote-tracking branch 'gitcafe/gitcafe-pages'

Conflicts:
	index.js