Slight Edits to Data
Merge branch 'gh-pages'

Conflicts:
	data/compendium.json