More stuff.
Merge branch 'master' of https://github.com/briancribb/STRPG-world-atlas

Conflicts:
	index.html
	js/STRPG.details.js