2
Merge branch 'master' of github.com:mike634/Tester

Conflicts:
	Testin.php
fix