dd

dsf
Merge branch 'master' into test3

Conflicts:
	index.php
Revert "new file"

This reverts commit 94fbba767f7e03cd17f486761bc3212b07590674.
Revert 94fbba7..f2189b8

This rolls back to commit 94fbba767f7e03cd17f486761bc3212b07590674.
Revert "dd"

Conflicts:
	index.php
Merge branch 'test3'