test commit 2
test commit 4
Merge branch 'test_branch'
test commit 5
Merge branch 'test_branch'

Conflicts:
	public/index.php