Revert "Testing stuff"

This reverts commit 2fff3e8fed9767d4bbe42513f08c29384774d25f.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php