add osx
more stuff
Merge remote branch 'origin/master'

Conflicts:
	media/doc.html