Tricorn
Burning ship
Merge branch 'master' into tricorn
Merge branch 'master' into burning-ship
Merge branch 'master' into burning-ship
Merge branch 'master' into tricorn
Merge branch 'burning-ship' into gh-pages

Conflicts:
	index.js
Merge branch 'tricorn' into gh-pages

Conflicts:
	index.js
Fix links