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

Conflicts:
	js/STRPG.details.js