merge this disaster

This reverts commit cfc422bdb0f5d3673e72f49e90b2c5679b088a8f.

Conflicts:
	.DS_Store