Revert "Revert 555ceea..55af558"

This reverts commit 6913924ed911c9151ca05bbe4ec6dbe3cd2c1fef.

Conflicts:
	.gitignore