mac is better
Merge commit 'f316be21f1483b6da23ee8e97b2d4b03e4eb483d'

Conflicts:
	untitled text 45.txt