Automatic Commit
Merge branch 'master' of github.com:xovilichter/xovi

Conflicts:
	test.php
	test_array.txt