test mamu
Merge branch 'master' of https://github.com/windstruck/itnews

Conflicts:
	test.php