Describing Ser Waymar Royce
Merge remote-tracking branch 'origin/master'

Conflicts:
	meta/GameOfThrones.adoc