Revert "test commit 2"

This reverts commit 66e7dee287c72a7bf876c0f60092583737062b55.

Conflicts:
	.htaccess