Oh so many things

Conflicts:
	content/characters/black/E.mv
	content/characters/black/holes/horizon.ch
	content/characters/black/holes/release.mv
	content/characters/black/j214D.mv