moved git test files
added info.php
changed info.php
Merge branch 'master' of github.com:matthiasvogt/test

Conflicts:
	test.txt