What to do without God?
Merge branch 'macosx'

Conflicts:
	index.html