changes
Merge branch 'master' of github.com:Solutions3E/testnike

Conflicts:
	test.php