Revert "test commit 2"

This reverts commit 66e7dee287c72a7bf876c0f60092583737062b55.

Conflicts:
	.htaccess
test 4

git ignore
Revert "test 3"

This reverts commit 9848f76ddc04345b3bf86ef856ab3c238b568b91.
Merge remote-tracking branch 'origin/master' into development