Merge branch 'gh-pages' of https://github.com/callumbashford/piratespy into gh-pages

Conflicts:
	script.js