change doc
Merge commit '6f339fa'

Conflicts:
	god.test