Merge branch 'index'

Conflicts:
	public_html/tests/test.php