changes
changges

Conflicts:
	doc/build-osx.md