new version (Boi)
merge test
merge
Merge branch 'master' of https://github.com/wormwalker/test

Conflicts:
	index.php